stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8025124: InitialToken.useNullKey incorrectly applies NULL_KEY in some cases

Browse Source 
Reviewed-by: xuelei
This commit is contained in:
Weijun Wang 2013-10-16 14:39:00 +08:00
parent 04360f139e
commit 45dc5dd0df
2 changed files with 13 additions and 17 deletions
jdk/src/share/classes/sun/security
jgss/krb5
InitialToken.java
krb5
KrbCred.java

25
jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java

@ -277,24 +277,17 @@ abstract class InitialToken extends Krb5Token {
byte[] credBytes = new byte[credLen]; byte[] credBytes = new byte[credLen];
System.arraycopy(checksumBytes, 28, credBytes, 0, credLen); System.arraycopy(checksumBytes, 28, credBytes, 0, credLen);
CipherHelper cipherHelper = context.getCipherHelper(key); KrbCred cred;
if (useNullKey(cipherHelper)) { try {
delegCreds = cred = new KrbCred(credBytes, key);
new KrbCred(credBytes, EncryptionKey.NULL_KEY). } catch (KrbException ke) {
getDelegatedCreds()[0]; if (subKey != null) {
} else { cred = new KrbCred(credBytes, subKey);
KrbCred cred; } else {
try { throw ke;
cred = new KrbCred(credBytes, key);
} catch (KrbException e) {
if (subKey != null) {
cred = new KrbCred(credBytes, subKey);
} else {
throw e;
}
} }
delegCreds = cred.getDelegatedCreds()[0];
} }
delegCreds = cred.getDelegatedCreds()[0];
} }
} }

5
jdk/src/share/classes/sun/security/krb5/KrbCred.java

@ -119,7 +119,7 @@ public class KrbCred {
return credMessg; return credMessg;
} }
// Used in InitialToken, key always NULL_KEY // Used in InitialToken, NULL_KEY might be used
public KrbCred(byte[] asn1Message, EncryptionKey key) public KrbCred(byte[] asn1Message, EncryptionKey key)
throws KrbException, IOException { throws KrbException, IOException {
@ -127,6 +127,9 @@ public class KrbCred {
ticket = credMessg.tickets[0]; ticket = credMessg.tickets[0];
if (credMessg.encPart.getEType() == 0) {
key = EncryptionKey.NULL_KEY;
}
byte[] temp = credMessg.encPart.decrypt(key, byte[] temp = credMessg.encPart.decrypt(key,
KeyUsage.KU_ENC_KRB_CRED_PART); KeyUsage.KU_ENC_KRB_CRED_PART);
byte[] plainText = credMessg.encPart.reset(temp); byte[] plainText = credMessg.encPart.reset(temp);