my bad, forgot to commit the test fixes, now done at rev. 1234302. thanks Pierre-Arnaud for the heads up, appreciate it
On Fri, Jan 20, 2012 at 9:54 PM, Pierre-Arnaud Marcelot <[email protected]> wrote: > Kiran, Aleksander, > > This changes makes the build fail on my system. > > Here's the error I get: > Failed tests: > testAes128Configuration(org.apache.directory.server.kerberos.protocol.AuthenticationEncryptionTypeTest): > KDC has no support for encryption type expected:<KDC has no support for > encryption type> but was:<Integrity check on decrypted field failed> > > Was it passing fine on your systems? > > Thanks, > Pierre-Arnaud > > > On 20 janv. 2012, at 15:27, [email protected] wrote: > >> Author: kayyagari >> Date: Fri Jan 20 14:27:02 2012 >> New Revision: 1233924 >> >> URL: http://svn.apache.org/viewvc?rev=1233924&view=rev >> Log: >> o applied the patch from Aleksander Adamowski, thank you >> >> Modified: >> >> directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java >> >> Modified: >> directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java >> URL: >> http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java?rev=1233924&r1=1233923&r2=1233924&view=diff >> ============================================================================== >> --- >> directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java >> (original) >> +++ >> directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java >> Fri Jan 20 14:27:02 2012 >> @@ -85,7 +85,7 @@ public class KdcServer extends Directory >> >> /** The default encryption types */ >> private static final String[] DEFAULT_ENCRYPTION_TYPES = new String[] >> - { "des-cbc-md5" }; >> + { "aes128-cts-hmac-sha1-96", "des3-cbc-sha1-kd", "des-cbc-md5" }; >> >> /** The default for allowing empty addresses */ >> private static final boolean DEFAULT_EMPTY_ADDRESSES_ALLOWED = true; >> @@ -557,12 +557,11 @@ public class KdcServer extends Directory >> >> for ( String enc : encryptionTypeStrings ) >> { >> - for ( EncryptionType type : EncryptionType.getEncryptionTypes() >> ) >> + EncryptionType type = EncryptionType.getByName(enc); >> + >> + if ( ! EncryptionType.UNKNOWN.equals(type) ) >> { >> - if ( type.getName().equalsIgnoreCase( enc ) ) >> - { >> - encryptionTypes.add( type ); >> - } >> + encryptionTypes.add( type ); >> } >> } >> } >> >> > -- Kiran Ayyagari
