directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r590676 - in /directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared: io/decoder/ messages/ messages/components/ service/ store/
Date Wed, 31 Oct 2007 13:55:43 GMT
Author: elecharny
Date: Wed Oct 31 06:55:38 2007
New Revision: 590676

URL: http://svn.apache.org/viewvc?rev=590676&view=rev
Log:
Replaced all the reference on '5' by the KerberosConstants.KERBEROS_V5 constant

Modified:
    directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcRequestDecoder.java
    directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KerberosMessage.java
    directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Authenticator.java
    directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java
    directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/VerifyAuthHeader.java
    directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java

Modified: directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcRequestDecoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcRequestDecoder.java?rev=590676&r1=590675&r2=590676&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcRequestDecoder.java
(original)
+++ directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcRequestDecoder.java
Wed Oct 31 06:55:38 2007
@@ -24,6 +24,7 @@
 import java.nio.ByteBuffer;
 import java.util.Enumeration;
 
+import org.apache.directory.server.kerberos.shared.KerberosConstants;
 import org.apache.directory.server.kerberos.shared.KerberosMessageType;
 import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
 import org.apache.directory.server.kerberos.shared.messages.value.KdcOptions;
@@ -78,7 +79,7 @@
      }*/
     private KdcRequest decodeKdcRequestSequence( DERSequence sequence ) throws IOException
     {
-        int pvno = 5;
+        int pvno = KerberosConstants.KERBEROS_V5;
         KerberosMessageType msgType = null;
 
         PaData[] paData = null;

Modified: directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KerberosMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KerberosMessage.java?rev=590676&r1=590675&r2=590676&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KerberosMessage.java
(original)
+++ directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KerberosMessage.java
Wed Oct 31 06:55:38 2007
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.server.kerberos.shared.messages;
 
+import org.apache.directory.server.kerberos.shared.KerberosConstants;
 import org.apache.directory.server.kerberos.shared.KerberosMessageType;
 
 
@@ -31,7 +32,7 @@
     /**
      * The Kerberos protocol version number (5).
      */
-    public static final int PVNO = 5;
+    public static final int PVNO = KerberosConstants.KERBEROS_V5;
 
     private int protocolVersionNumber;
     private KerberosMessageType messageType;

Modified: directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Authenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Authenticator.java?rev=590676&r1=590675&r2=590676&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Authenticator.java
(original)
+++ directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Authenticator.java
Wed Oct 31 06:55:38 2007
@@ -22,6 +22,7 @@
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.server.kerberos.shared.KerberosConstants;
 import org.apache.directory.server.kerberos.shared.messages.Encodable;
 import org.apache.directory.server.kerberos.shared.messages.value.AuthorizationData;
 import org.apache.directory.server.kerberos.shared.messages.value.Checksum;
@@ -38,7 +39,7 @@
     /**
      * Constant for the authenticator version number.
      */
-    public static final int AUTHENTICATOR_VNO = 5;
+    public static final int AUTHENTICATOR_VNO = KerberosConstants.KERBEROS_V5;
 
     private int versionNumber;
     private KerberosPrincipal clientPrincipal;

Modified: directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java?rev=590676&r1=590675&r2=590676&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java
(original)
+++ directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java
Wed Oct 31 06:55:38 2007
@@ -26,6 +26,7 @@
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.server.kerberos.shared.KerberosConstants;
 import org.apache.directory.server.kerberos.shared.KerberosUtils;
 import org.apache.directory.server.kerberos.shared.exceptions.ErrorType;
 import org.apache.directory.server.kerberos.shared.messages.value.AuthorizationData;
@@ -61,7 +62,7 @@
     private static final boolean IS_DEBUG = LOG.isDebugEnabled();
     
     /** Constant for the {@link Ticket} version number (5) */
-    public static final int TICKET_VNO = 5;
+    public static final int TICKET_VNO = KerberosConstants.KERBEROS_V5;
 
     /** The Kerberos version number. Should be 5 */
     private int tktvno;

Modified: directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/VerifyAuthHeader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/VerifyAuthHeader.java?rev=590676&r1=590675&r2=590676&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/VerifyAuthHeader.java
(original)
+++ directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/VerifyAuthHeader.java
Wed Oct 31 06:55:38 2007
@@ -24,6 +24,7 @@
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.server.kerberos.shared.KerberosConstants;
 import org.apache.directory.server.kerberos.shared.KerberosMessageType;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
@@ -73,7 +74,7 @@
         long clockSkew, ReplayCache replayCache, boolean emptyAddressesAllowed, InetAddress
clientAddress,
         CipherTextHandler lockBox, KeyUsage authenticatorKeyUsage, boolean isValidate ) throws
KerberosException
     {
-        if ( authHeader.getProtocolVersionNumber() != 5 )
+        if ( authHeader.getProtocolVersionNumber() != KerberosConstants.KERBEROS_V5 )
         {
             throw new KerberosException( ErrorType.KRB_AP_ERR_BADVERSION );
         }
@@ -83,7 +84,7 @@
             throw new KerberosException( ErrorType.KRB_AP_ERR_MSG_TYPE );
         }
 
-        if ( authHeader.getTicket().getTktVno() != 5 )
+        if ( authHeader.getTicket().getTktVno() != KerberosConstants.KERBEROS_V5 )
         {
             throw new KerberosException( ErrorType.KRB_AP_ERR_BADVERSION );
         }

Modified: directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java?rev=590676&r1=590675&r2=590676&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java
(original)
+++ directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java
Wed Oct 31 06:55:38 2007
@@ -28,6 +28,7 @@
 import javax.security.auth.kerberos.KerberosPrincipal;
 import javax.security.auth.kerberos.KerberosTicket;
 
+import org.apache.directory.server.kerberos.shared.KerberosConstants;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
@@ -118,7 +119,7 @@
         EncryptedData encryptedTicketPart = cipherTextHandler.seal( serverKey, encTicketPart,
KeyUsage.NUMBER2 );
 
         Ticket ticket = new Ticket();
-        ticket.setTktVno( 5 );
+        ticket.setTktVno( KerberosConstants.KERBEROS_V5 );
         ticket.setServerPrincipal( serverPrincipal );
         ticket.setEncPart( encryptedTicketPart );
 



Mime
View raw message