diff options
Diffstat (limited to 'src/share/classes/sun/security/krb5/EncryptionKey.java')
-rw-r--r-- | src/share/classes/sun/security/krb5/EncryptionKey.java | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/share/classes/sun/security/krb5/EncryptionKey.java b/src/share/classes/sun/security/krb5/EncryptionKey.java index ac54b14d5..ff920af8e 100644 --- a/src/share/classes/sun/security/krb5/EncryptionKey.java +++ b/src/share/classes/sun/security/krb5/EncryptionKey.java @@ -188,24 +188,13 @@ public class EncryptionKey etypes = EType.getBuiltInDefaults(); } - // set the preferred etype for preauth - if ((pa_exists) && (pa_etype != EncryptedData.ETYPE_NULL)) { - if (DEBUG) { - System.out.println("Pre-Authentication: " + - "Set preferred etype = " + pa_etype); - } - if (EType.isSupported(pa_etype)) { - // reset etypes to preferred value - etypes = new int[1]; - etypes[0] = pa_etype; - } - } - EncryptionKey[] encKeys = new EncryptionKey[etypes.length]; for (int i = 0; i < etypes.length; i++) { if (EType.isSupported(etypes[i])) { + byte[] s2kparams = (pa_exists && etypes[i] == pa_etype) + ? pa_s2kparams : null; encKeys[i] = new EncryptionKey( - stringToKey(password, salt, pa_s2kparams, etypes[i]), + stringToKey(password, salt, s2kparams, etypes[i]), etypes[i], null); } else { if (DEBUG) { |