svn commit: r1041748 - in /directory/apacheds/branches/apacheds-kerberos-codec-2.0: kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/ kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/i...

[ka...@apache.org]

Author: kayyagari
Date: Fri Dec  3 09:51:03 2010
New Revision: 1041748

URL: http://svn.apache.org/viewvc?rev=1041748&view=rev
Log:
o removed EncApRepPart/Modifier

Removed:
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/EncApRepPart.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/EncApRepPartModifier.java
Modified:
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncApRepPartDecoder.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java?rev=1041748&r1=1041747&r2=1041748&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java Fri Dec  3 09:51:03 2010
@@ -38,7 +38,6 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.io.decoder.EncTicketPartDecoder;
 import org.apache.directory.server.kerberos.shared.io.decoder.EncryptedTimestampDecoder;
 import org.apache.directory.server.kerberos.shared.messages.Encodable;
-import org.apache.directory.server.kerberos.shared.messages.components.EncApRepPart;
 import org.apache.directory.server.kerberos.shared.messages.components.EncKdcRepPart;
 import org.apache.directory.server.kerberos.shared.messages.components.EncKrbPrivPart;
 import org.apache.directory.shared.asn1.AbstractAsn1Object;
@@ -50,6 +49,7 @@ import org.apache.directory.shared.kerbe
 import org.apache.directory.shared.kerberos.components.EncryptionKey;
 import org.apache.directory.shared.kerberos.components.PaEncTsEnc;
 import org.apache.directory.shared.kerberos.messages.Authenticator;
+import org.apache.directory.shared.kerberos.messages.EncApRepPart;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncApRepPartDecoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncApRepPartDecoder.java?rev=1041748&r1=1041747&r2=1041748&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncApRepPartDecoder.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncApRepPartDecoder.java Fri Dec  3 09:51:03 2010
@@ -24,8 +24,6 @@ import java.io.IOException;
 import java.util.Enumeration;
 
 import org.apache.directory.server.kerberos.shared.messages.Encodable;
-import org.apache.directory.server.kerberos.shared.messages.components.EncApRepPart;
-import org.apache.directory.server.kerberos.shared.messages.components.EncApRepPartModifier;
 import org.apache.directory.shared.asn1.der.ASN1InputStream;
 import org.apache.directory.shared.asn1.der.DERApplicationSpecific;
 import org.apache.directory.shared.asn1.der.DEREncodable;
@@ -33,6 +31,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.der.DERInteger;
 import org.apache.directory.shared.asn1.der.DERSequence;
 import org.apache.directory.shared.asn1.der.DERTaggedObject;
+import org.apache.directory.shared.kerberos.messages.EncApRepPart;
 
 
 /**
@@ -73,7 +72,7 @@ public class EncApRepPartDecoder impleme
      */
     private EncApRepPart decodeEncApRepPartSequence( DERSequence sequence )
     {
-        EncApRepPartModifier modifier = new EncApRepPartModifier();
+        EncApRepPart encApRepPart = new EncApRepPart();
 
         for ( Enumeration e = sequence.getObjects(); e.hasMoreElements(); )
         {
@@ -85,23 +84,23 @@ public class EncApRepPartDecoder impleme
             {
                 case 0:
                     DERGeneralizedTime tag0 = ( DERGeneralizedTime ) derObject;
-                    modifier.setClientTime( KerberosTimeDecoder.decode( tag0 ) );
+                    encApRepPart.setClientTime( KerberosTimeDecoder.decode( tag0 ) );
                     break;
                 case 1:
                     DERInteger tag1 = ( DERInteger ) derObject;
-                    modifier.setClientMicroSecond( Integer.valueOf( tag1.intValue() ) );
+                    encApRepPart.setClientMicroSecond( Integer.valueOf( tag1.intValue() ) );
                     break;
                 case 2:
                     DERSequence tag2 = ( DERSequence ) derObject;
-                    modifier.setSubSessionKey( EncryptionKeyDecoder.decode( tag2 ) );
+                    encApRepPart.setSubSessionKey( EncryptionKeyDecoder.decode( tag2 ) );
                     break;
                 case 3:
                     DERInteger tag3 = ( DERInteger ) derObject;
-                    modifier.setSequenceNumber( Integer.valueOf( tag3.intValue() ) );
+                    encApRepPart.setSequenceNumber( Integer.valueOf( tag3.intValue() ) );
                     break;
             }
         }
 
-        return modifier.getEncApRepPart();
+        return encApRepPart.getEncApRepPart();
     }
 }

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java?rev=1041748&r1=1041747&r2=1041748&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java Fri Dec  3 09:51:03 2010
@@ -43,8 +43,6 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
 import org.apache.directory.server.kerberos.shared.messages.application.ApplicationReply;
 import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage;
-import org.apache.directory.server.kerberos.shared.messages.components.EncApRepPart;
-import org.apache.directory.server.kerberos.shared.messages.components.EncApRepPartModifier;
 import org.apache.directory.server.kerberos.shared.messages.components.EncKrbPrivPart;
 import org.apache.directory.server.kerberos.shared.messages.components.EncKrbPrivPartModifier;
 import org.apache.directory.server.kerberos.shared.replay.InMemoryReplayCache;
@@ -58,6 +56,7 @@ import org.apache.directory.shared.kerbe
 import org.apache.directory.shared.kerberos.components.HostAddress;
 import org.apache.directory.shared.kerberos.components.HostAddresses;
 import org.apache.directory.shared.kerberos.messages.Authenticator;
+import org.apache.directory.shared.kerberos.messages.EncApRepPart;
 import org.apache.directory.shared.kerberos.messages.Ticket;
 import org.apache.mina.core.session.IoSession;
 import org.slf4j.Logger;
@@ -385,13 +384,11 @@ public class ChangePasswordService
         PrivateMessage privateMessage = new PrivateMessage( encPrivPart );
 
         // Begin AP_REP generation
-        EncApRepPartModifier encApModifier = new EncApRepPartModifier();
-        encApModifier.setClientTime( authenticator.getCtime() );
-        encApModifier.setClientMicroSecond( authenticator.getCusec() );
-        encApModifier.setSequenceNumber( Integer.valueOf( authenticator.getSeqNumber() ) );
-        encApModifier.setSubSessionKey( authenticator.getSubKey() );
-
-        EncApRepPart repPart = encApModifier.getEncApRepPart();
+        EncApRepPart repPart = new EncApRepPart();
+        repPart.setCTime( authenticator.getCtime() );
+        repPart.setCusec( authenticator.getCusec() );
+        repPart.setSeqNumber( Integer.valueOf( authenticator.getSeqNumber() ) );
+        repPart.setSubkey( authenticator.getSubKey() );
 
         EncryptedData encRepPart;