directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1233924 - /directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
Date Fri, 20 Jan 2012 14:27:03 GMT
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 );
             }
         }
     }



Mime
View raw message