Index: modules/security/src/main/java/common/java/security/KeyStoreSpi.java =================================================================== --- modules/security/src/main/java/common/java/security/KeyStoreSpi.java (revision 412081) +++ modules/security/src/main/java/common/java/security/KeyStoreSpi.java (working copy) @@ -322,10 +322,18 @@ cl2 = Class.forName("java.security.KeyStore$SecretKeyEntry"); } if ((cl1 != null) && entryClass.isAssignableFrom(cl1)) { - return true; + if (engineGetCertificate(alias) != null){ + return true; + } else { + return false; + } } if ((cl2 != null) && entryClass.isAssignableFrom(cl2)) { - return true; + if (engineGetCertificate(alias) == null){ + return true; + } else { + return false; + } } return false; } catch (ClassNotFoundException e) {