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

6932525: Incorrect encryption types of KDC_REQ_BODY of AS-REQ with pre-authentication

Browse Source 
Reviewed-by: valeriep
This commit is contained in:
Weijun Wang 2010-05-24 10:05:04 +08:00
parent 37ae69dba3
commit 480f0af4e8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jdk/src/share/classes/sun/security/krb5/KrbAsReq.java
View File

@ -1,5 +1,5 @@
/* /*
* Portions Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved. * Portions Copyright 2000-2010 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -344,16 +344,13 @@ public class KrbAsReq extends KrbKdcReq {
princName = cname; princName = cname;
EncryptionKey key = null; EncryptionKey key = null;
int[] tktETypes = null; int[] tktETypes = EType.getDefaults("default_tkt_enctypes");
if (pa_exists && pa_etype != EncryptedData.ETYPE_NULL) { if (pa_exists && pa_etype != EncryptedData.ETYPE_NULL) {
if (DEBUG) { if (DEBUG) {
System.out.println("Pre-Authenticaton: find key for etype = " + pa_etype); System.out.println("Pre-Authenticaton: find key for etype = " + pa_etype);
} }
key = EncryptionKey.findKey(pa_etype, keys); key = EncryptionKey.findKey(pa_etype, keys);
tktETypes = new int[1];
tktETypes[0] = pa_etype;
} else { } else {
tktETypes = EType.getDefaults("default_tkt_enctypes", keys);
key = EncryptionKey.findKey(tktETypes[0], keys); key = EncryptionKey.findKey(tktETypes[0], keys);
} }

5
jdk/test/sun/security/krb5/auto/KDC.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved. * Copyright 2008-2010 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -740,6 +740,9 @@ public class KDC {
Field f = KDCReqBody.class.getDeclaredField("eType"); Field f = KDCReqBody.class.getDeclaredField("eType");
f.setAccessible(true); f.setAccessible(true);
eTypes = (int[])f.get(body); eTypes = (int[])f.get(body);
if (eTypes.length < 2) {
throw new KrbException(Krb5.KDC_ERR_ETYPE_NOSUPP);
}
int eType = eTypes[0]; int eType = eTypes[0];
EncryptionKey ckey = keyForUser(body.cname, eType, false); EncryptionKey ckey = keyForUser(body.cname, eType, false);