--- old/src/java.base/share/classes/java/security/KeyStoreSpi.java Thu Oct 13 11:13:00 2016 +++ new/src/java.base/share/classes/java/security/KeyStoreSpi.java Thu Oct 13 11:13:00 2016 @@ -479,6 +479,10 @@ } else if (engineIsKeyEntry(alias)) { KeyStore.PasswordProtection pp = (KeyStore.PasswordProtection)protParam; + if (pp.getProtectionAlgorithm() != null) { + throw new KeyStoreException( + "unsupported password protection algorithm"); + } char[] password = pp.getPassword(); Key key = engineGetKey(alias, password); @@ -524,6 +528,10 @@ KeyStore.PasswordProtection pProtect = null; if (protParam != null) { pProtect = (KeyStore.PasswordProtection)protParam; + if (pProtect.getProtectionAlgorithm() != null) { + throw new KeyStoreException( + "unsupported password protection algorithm"); + } } // set entry