directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1041650 - in /directory/apacheds/branches/apacheds-kerberos-codec-2.0: kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/ kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/compone...
Date Thu, 02 Dec 2010 23:47:14 GMT
Author: elecharny
Date: Thu Dec  2 23:47:13 2010
New Revision: 1041650

URL: http://svn.apache.org/viewvc?rev=1041650&view=rev
Log:
o Various fixes
o removed the encryptedTimestamp class
o Removed the TransitedEncodingType class

Removed:
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedTimeStamp.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/TransitedEncodingType.java
Modified:
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreRenewtill.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTicketPartDecoderTest.java
    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/EncTicketPartDecoder.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncryptedTimestampDecoder.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedTimeStampModifier.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/TimestampChecker.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractAuthenticationServiceTest.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreRenewtill.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreRenewtill.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreRenewtill.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreRenewtill.java
Thu Dec  2 23:47:13 2010
@@ -50,7 +50,7 @@ public class StoreRenewtill extends Abst
     protected void setKerberosTime( KerberosTime krbtime, Asn1Container container )
     {
         EncTicketPartContainer encTicketPartContainer = ( EncTicketPartContainer ) container;
-        encTicketPartContainer.getEncTicketPart().setRenewtill( krbtime );
+        encTicketPartContainer.getEncTicketPart().setRenewTill( krbtime );
         
         container.setGrammarEndAllowed( true );
     }

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
Thu Dec  2 23:47:13 2010
@@ -487,7 +487,7 @@ public class EncTicketPart extends Abstr
     /**
      * @return the renewtill
      */
-    public KerberosTime getRenewtill()
+    public KerberosTime getRenewTill()
     {
         return renewtill;
     }
@@ -496,7 +496,7 @@ public class EncTicketPart extends Abstr
     /**
      * @param renewtill the renewtill to set
      */
-    public void setRenewtill( KerberosTime renewtill )
+    public void setRenewTill( KerberosTime renewtill )
     {
         this.renewtill = renewtill;
     }

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java
Thu Dec  2 23:47:13 2010
@@ -77,6 +77,16 @@ public class PaEncTsEnc extends Abstract
 
     
     /**
+     * Creates a new instance of PaEncTsEnc.
+     */
+    public PaEncTsEnc( KerberosTime paTimestamp, int pausec )
+    {
+        this.patimestamp = paTimestamp;
+        this.pausec = pausec;
+    }
+
+    
+    /**
      * Returns the patimestamp value.
      *
      * @return The patimestamp value.

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTicketPartDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTicketPartDecoderTest.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTicketPartDecoderTest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTicketPartDecoderTest.java
Thu Dec  2 23:47:13 2010
@@ -106,7 +106,7 @@ public class EncTicketPartDecoderTest
         expected.setAuthTime( authTime );
         expected.setStartTime( startTime );
         expected.setEndTime( endTime );
-        expected.setRenewtill( renewtill );
+        expected.setRenewTill( renewtill );
         expected.setClientAddresses( caddr );
         expected.setAuthorizationData( authzData );
     }
@@ -123,7 +123,7 @@ public class EncTicketPartDecoderTest
     public void testDecodeEncTicketPartWithoutStartAndRenewtillTimes() throws Exception
     {
         expected.setStartTime( null );
-        expected.setRenewtill( null );
+        expected.setRenewTill( null );
 
         encodeDecodeAndTest( expected );
     }
@@ -132,7 +132,7 @@ public class EncTicketPartDecoderTest
     @Test
     public void testDecodeEncTicketPartWithoutRenwtillTime() throws Exception
     {
-        expected.setRenewtill( null );
+        expected.setRenewTill( null );
 
         encodeDecodeAndTest( expected );
     }
@@ -141,7 +141,7 @@ public class EncTicketPartDecoderTest
     @Test
     public void testDecodeEncTicketPartWithoutRenwtillAndClientAddresses() throws Exception
     {
-        expected.setRenewtill( null );
+        expected.setRenewTill( null );
         expected.setClientAddresses( null );
 
         encodeDecodeAndTest( expected );
@@ -152,7 +152,7 @@ public class EncTicketPartDecoderTest
     public void testDecodeEncTicketPartWithoutOptionalElements() throws Exception
     {
         expected.setStartTime( null );
-        expected.setRenewtill( null );
+        expected.setRenewTill( null );
         expected.setClientAddresses( null );
         expected.setAuthorizationData( null );
 
@@ -200,7 +200,7 @@ public class EncTicketPartDecoderTest
         assertEquals( expected.getAuthTime(), actual.getAuthTime() );
         assertEquals( expected.getStartTime(), actual.getStartTime() );
         assertEquals( expected.getEndTime(), actual.getEndTime() );
-        assertEquals( expected.getRenewtill(), actual.getRenewtill() );
+        assertEquals( expected.getRenewTill(), actual.getRenewTill() );
         assertEquals( expected.getClientAddresses(), actual.getClientAddresses() );
         assertEquals( expected.getAuthorizationData(), actual.getAuthorizationData() );
     }

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=1041650&r1=1041649&r2=1041650&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
Thu Dec  2 23:47:13 2010
@@ -41,7 +41,7 @@ import org.apache.directory.server.kerbe
 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.server.kerberos.shared.messages.value.EncryptedTimeStamp;
+import org.apache.directory.shared.asn1.AbstractAsn1Object;
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
 import org.apache.directory.shared.kerberos.components.AuthorizationData;
@@ -49,7 +49,6 @@ import org.apache.directory.shared.kerbe
 import org.apache.directory.shared.kerberos.components.EncryptedData;
 import org.apache.directory.shared.kerberos.components.EncryptionKey;
 import org.apache.directory.shared.kerberos.messages.Authenticator;
-import org.apache.directory.shared.kerberos.messages.KerberosMessage;
 
 
 /**
@@ -73,7 +72,7 @@ public class CipherTextHandler
 
         map.put( EncTicketPart.class, EncTicketPartDecoder.class );
         map.put( Authenticator.class, AuthenticatorDecoder.class );
-        map.put( EncryptedTimeStamp.class, EncryptedTimestampDecoder.class );
+        map.put( PaEncTsEncÊ.class, EncryptedTimestampDecoder.class );
         map.put( AuthorizationData.class, AuthorizationDataDecoder.class );
         map.put( EncKrbPrivPart.class, EncKrbPrivPartDecoder.class );
         map.put( EncApRepPart.class, EncApRepPartDecoder.class );
@@ -105,7 +104,7 @@ public class CipherTextHandler
      * @return The Kerberos EncryptedData.
      * @throws KerberosException
      */
-    public EncryptedData seal( EncryptionKey key, KerberosMessage message, KeyUsage usage
) throws KerberosException
+    public EncryptedData seal( EncryptionKey key, AbstractAsn1Object message, KeyUsage usage
) throws KerberosException
     {
         try
         {

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncTicketPartDecoder.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/EncTicketPartDecoder.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncTicketPartDecoder.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncTicketPartDecoder.java
Thu Dec  2 23:47:13 2010
@@ -134,7 +134,7 @@ public class EncTicketPartDecoder implem
                     
                 case 8:
                     DERGeneralizedTime tag8 = ( DERGeneralizedTime ) derObject;
-                    modifier.setRenewtill( KerberosTimeDecoder.decode( tag8 ) );
+                    modifier.setRenewTill( KerberosTimeDecoder.decode( tag8 ) );
                     break;
                     
                 case 9:

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncryptedTimestampDecoder.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/EncryptedTimestampDecoder.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncryptedTimestampDecoder.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncryptedTimestampDecoder.java
Thu Dec  2 23:47:13 2010
@@ -24,7 +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.value.EncryptedTimeStamp;
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptedTimeStampModifier;
 import org.apache.directory.shared.asn1.der.ASN1InputStream;
 import org.apache.directory.shared.asn1.der.DEREncodable;
@@ -32,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.components.PaEncTsEnc;
 
 
 /**
@@ -63,7 +63,7 @@ public class EncryptedTimestampDecoder i
     }
 
 
-    protected EncryptedTimeStamp decodeEncryptedTimestamp( DERSequence sequence )
+    protected PaEncTsEnc decodeEncryptedTimestamp( DERSequence sequence )
     {
         EncryptedTimeStampModifier modifier = new EncryptedTimeStampModifier();
 

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedTimeStampModifier.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/messages/value/EncryptedTimeStampModifier.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedTimeStampModifier.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedTimeStampModifier.java
Thu Dec  2 23:47:13 2010
@@ -20,6 +20,7 @@
 package org.apache.directory.server.kerberos.shared.messages.value;
 
 import org.apache.directory.shared.kerberos.KerberosTime;
+import org.apache.directory.shared.kerberos.components.PaEncTsEnc;
 
 /**
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -35,9 +36,9 @@ public class EncryptedTimeStampModifier
      *
      * @return The {@link EncryptedTimeStamp}.
      */
-    public EncryptedTimeStamp getEncryptedTimestamp()
+    public PaEncTsEnc getEncryptedTimestamp()
     {
-        return new EncryptedTimeStamp( timeStamp, microSecond );
+        return new PaEncTsEnc( timeStamp, microSecond );
     }
 
 

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.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/store/TicketFactory.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java
Thu Dec  2 23:47:13 2010
@@ -141,8 +141,8 @@ public class TicketFactory
 
         KerberosPrincipal client = ticket.getEncTicketPart().getClientPrincipal();
         KerberosPrincipal server = ticket.getServerPrincipal();
-        byte[] sessionKey = ticket.getEncTicketPart().getSessionKey().getKeyValue();
-        int keyType = ticket.getEncTicketPart().getSessionKey().getKeyType().getValue();
+        byte[] sessionKey = ticket.getEncTicketPart().getKey().getKeyValue();
+        int keyType = ticket.getEncTicketPart().getKey().getKeyType().getValue();
 
         boolean[] flags = new boolean[32];
 

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java
Thu Dec  2 23:47:13 2010
@@ -34,11 +34,11 @@ import javax.security.auth.kerberos.Kerb
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
-import org.apache.directory.shared.kerberos.components.EncryptedData;
-import org.apache.directory.server.kerberos.shared.messages.value.EncryptedTimeStamp;
 import org.apache.directory.shared.kerberos.KerberosTime;
 import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
+import org.apache.directory.shared.kerberos.components.EncryptedData;
 import org.apache.directory.shared.kerberos.components.EncryptionKey;
+import org.apache.directory.shared.kerberos.components.PaEncTsEnc;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -138,7 +138,7 @@ public class CipherTextHandlerTest
     public void testDesGoodPasswordDecrypt()
     {
         CipherTextHandler lockBox = new CipherTextHandler();
-        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
+        Class<PaEncTsEnc> hint = PaEncTsEnc.class;
         KerberosPrincipal principal = new KerberosPrincipal( "erodriguez@EXAMPLE.COM" );
         KerberosKey kerberosKey = new KerberosKey( principal, "kerby".toCharArray(), "DES"
);
         EncryptionKey key = new EncryptionKey( EncryptionType.DES_CBC_MD5, kerberosKey.getEncoded()
);
@@ -146,7 +146,7 @@ public class CipherTextHandlerTest
 
         try
         {
-            EncryptedTimeStamp object = ( EncryptedTimeStamp ) lockBox.unseal( hint, key,
data, KeyUsage.NUMBER1 );
+            PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, data, KeyUsage.NUMBER1
);
             assertEquals( "TimeStamp", "20070322233107Z", object.getTimeStamp().toString()
);
             assertEquals( "MicroSeconds", 291067, object.getMicroSeconds() );
         }
@@ -165,7 +165,7 @@ public class CipherTextHandlerTest
     public void testDesBadPasswordDecrypt()
     {
         CipherTextHandler lockBox = new CipherTextHandler();
-        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
+        Class<PaEncTsEnc> hint = PaEncTsEnc.class;
         KerberosPrincipal principal = new KerberosPrincipal( "erodriguez@EXAMPLE.COM" );
         KerberosKey kerberosKey = new KerberosKey( principal, "badpassword".toCharArray(),
"DES" );
         EncryptionKey key = new EncryptionKey( EncryptionType.DES_CBC_MD5, kerberosKey.getEncoded()
);
@@ -192,7 +192,7 @@ public class CipherTextHandlerTest
     public void testTripleDesGoodPasswordDecrypt()
     {
         CipherTextHandler lockBox = new CipherTextHandler();
-        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
+        Class<PaEncTsEnc> hint = PaEncTsEnc.class;
         KerberosPrincipal principal = new KerberosPrincipal( "hnelson@EXAMPLE.COM" );
         String algorithm = VendorHelper.getTripleDesAlgorithm();
         KerberosKey kerberosKey = new KerberosKey( principal, "secret".toCharArray(), algorithm
);
@@ -201,7 +201,7 @@ public class CipherTextHandlerTest
 
         try
         {
-            EncryptedTimeStamp object = ( EncryptedTimeStamp ) lockBox.unseal( hint, key,
data, KeyUsage.NUMBER1 );
+            PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, data, KeyUsage.NUMBER1
);
             assertEquals( "TimeStamp", "20070410190400Z", object.getTimeStamp().toString()
);
             assertEquals( "MicroSeconds", 460450, object.getMicroSeconds() );
         }
@@ -230,7 +230,7 @@ public class CipherTextHandlerTest
 
         String zuluTime = "20070410190400Z";
         int microSeconds = 460450;
-        EncryptedTimeStamp encryptedTimeStamp = getEncryptedTimeStamp( zuluTime, microSeconds
);
+        PaEncTsEnc encryptedTimeStamp = getEncryptedTimeStamp( zuluTime, microSeconds );
 
         EncryptedData encryptedData = null;
 
@@ -243,11 +243,11 @@ public class CipherTextHandlerTest
             fail( "Should not have caught exception." );
         }
 
-        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
+        Class<PaEncTsEnc> hint = PaEncTsEnc.class;
 
         try
         {
-            EncryptedTimeStamp object = ( EncryptedTimeStamp ) lockBox.unseal( hint, key,
encryptedData,
+            PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, encryptedData,
                 KeyUsage.NUMBER1 );
             assertEquals( "TimeStamp", zuluTime, object.getTimeStamp().toString() );
             assertEquals( "MicroSeconds", microSeconds, object.getMicroSeconds() );
@@ -273,7 +273,7 @@ public class CipherTextHandlerTest
         }
 
         CipherTextHandler lockBox = new CipherTextHandler();
-        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
+        Class<PaEncTsEnc> hint = PaEncTsEnc.class;
         KerberosPrincipal principal = new KerberosPrincipal( "hnelson@EXAMPLE.COM" );
         KerberosKey kerberosKey = new KerberosKey( principal, "secret".toCharArray(), "AES128"
);
         EncryptionKey key = new EncryptionKey( EncryptionType.AES128_CTS_HMAC_SHA1_96, kerberosKey.getEncoded()
);
@@ -281,7 +281,7 @@ public class CipherTextHandlerTest
 
         try
         {
-            EncryptedTimeStamp object = ( EncryptedTimeStamp ) lockBox.unseal( hint, key,
data, KeyUsage.NUMBER1 );
+            PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, data, KeyUsage.NUMBER1
);
             assertEquals( "TimeStamp", "20070410212557Z", object.getTimeStamp().toString()
);
             assertEquals( "MicroSeconds", 379386, object.getMicroSeconds() );
         }
@@ -314,7 +314,7 @@ public class CipherTextHandlerTest
 
         String zuluTime = "20070410190400Z";
         int microSeconds = 460450;
-        EncryptedTimeStamp encryptedTimeStamp = getEncryptedTimeStamp( zuluTime, microSeconds
);
+        PaEncTsEnc encryptedTimeStamp = getEncryptedTimeStamp( zuluTime, microSeconds );
 
         EncryptedData encryptedData = null;
 
@@ -327,11 +327,11 @@ public class CipherTextHandlerTest
             fail( "Should not have caught exception." );
         }
 
-        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
+        Class<PaEncTsEnc> hint = PaEncTsEnc.class;
 
         try
         {
-            EncryptedTimeStamp object = ( EncryptedTimeStamp ) lockBox.unseal( hint, key,
encryptedData,
+            PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, encryptedData,
                 KeyUsage.NUMBER1 );
             assertEquals( "TimeStamp", "20070410190400Z", object.getTimeStamp().toString()
);
             assertEquals( "MicroSeconds", 460450, object.getMicroSeconds() );
@@ -357,7 +357,7 @@ public class CipherTextHandlerTest
         }
 
         CipherTextHandler lockBox = new CipherTextHandler();
-        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
+        Class<PaEncTsEnc> hint = PaEncTsEnc.class;
 
         KerberosKey kerberosKey;
 
@@ -377,7 +377,7 @@ public class CipherTextHandlerTest
 
         try
         {
-            EncryptedTimeStamp object = ( EncryptedTimeStamp ) lockBox.unseal( hint, key,
data, KeyUsage.NUMBER1 );
+            PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, data, KeyUsage.NUMBER1
);
             assertEquals( "TimeStamp", "20070410212809Z", object.getTimeStamp().toString()
);
             assertEquals( "MicroSeconds", 298294, object.getMicroSeconds() );
         }
@@ -422,7 +422,7 @@ public class CipherTextHandlerTest
 
         String zuluTime = "20070410190400Z";
         int microSeconds = 460450;
-        EncryptedTimeStamp encryptedTimeStamp = getEncryptedTimeStamp( zuluTime, microSeconds
);
+        PaEncTsEnc encryptedTimeStamp = getEncryptedTimeStamp( zuluTime, microSeconds );
 
         EncryptedData encryptedData = null;
 
@@ -435,11 +435,11 @@ public class CipherTextHandlerTest
             fail( "Should not have caught exception." );
         }
 
-        Class<EncryptedTimeStamp> hint = EncryptedTimeStamp.class;
+        Class<PaEncTsEnc> hint = PaEncTsEnc.class;
 
         try
         {
-            EncryptedTimeStamp object = ( EncryptedTimeStamp ) lockBox.unseal( hint, key,
encryptedData,
+            PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, encryptedData,
                 KeyUsage.NUMBER1 );
             assertEquals( "TimeStamp", "20070410190400Z", object.getTimeStamp().toString()
);
             assertEquals( "MicroSeconds", 460450, object.getMicroSeconds() );
@@ -451,7 +451,7 @@ public class CipherTextHandlerTest
     }
 
 
-    protected EncryptedTimeStamp getEncryptedTimeStamp( String zuluTime, int microSeconds
) throws ParseException
+    protected PaEncTsEnc getEncryptedTimeStamp( String zuluTime, int microSeconds ) throws
ParseException
     {
         Date date = null;
         synchronized ( dateFormat )
@@ -461,14 +461,14 @@ public class CipherTextHandlerTest
 
         KerberosTime timeStamp = new KerberosTime( date );
 
-        return new EncryptedTimeStamp( timeStamp, microSeconds );
+        return new PaEncTsEnc( timeStamp, microSeconds );
     }
 
     /*
      public void testArcFourGoodPassword()
      {
      LockBox lockBox = new LockBox();
-     Class hint = EncryptedTimeStamp.class;
+     Class hint = PaEncTsEnc.class;
      KerberosPrincipal principal = new KerberosPrincipal( "hnelson@EXAMPLE.COM" );
      KerberosKey kerberosKey = new KerberosKey( principal, "secret".toCharArray(), "ArcFourHmac"
);
      EncryptionKey key = new EncryptionKey( EncryptionType.RC4_HMAC, kerberosKey.getEncoded()
);
@@ -476,7 +476,7 @@ public class CipherTextHandlerTest
 
      try
      {
-     EncryptedTimeStamp object = ( EncryptedTimeStamp ) lockBox.unseal( hint, key, data );
+     PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, data );
      assertEquals( "TimeStamp", "20070322233107Z", object.getTimeStamp().toString() );
      assertEquals( "MicroSeconds", 291067, object.getMicroSeconds() );
      }

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java
Thu Dec  2 23:47:13 2010
@@ -42,7 +42,6 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.io.decoder.EncryptedDataDecoder;
 import org.apache.directory.server.kerberos.shared.messages.AuthenticationReply;
 import org.apache.directory.server.kerberos.shared.messages.KdcReply;
-import org.apache.directory.server.kerberos.shared.messages.value.EncryptedTimeStamp;
 import org.apache.directory.server.kerberos.shared.messages.value.EncryptionTypeInfoEntry;
 import org.apache.directory.server.kerberos.shared.replay.InMemoryReplayCache;
 import org.apache.directory.server.kerberos.shared.replay.ReplayCache;
@@ -59,6 +58,8 @@ import org.apache.directory.shared.kerbe
 import org.apache.directory.shared.kerberos.components.KdcReq;
 import org.apache.directory.shared.kerberos.components.LastReq;
 import org.apache.directory.shared.kerberos.components.PaData;
+import org.apache.directory.shared.kerberos.components.PaEncTimestamp;
+import org.apache.directory.shared.kerberos.components.PaEncTsEnc;
 import org.apache.directory.shared.kerberos.components.PrincipalName;
 import org.apache.directory.shared.kerberos.components.TransitedEncoding;
 import org.apache.directory.shared.kerberos.exceptions.InvalidTicketException;
@@ -269,7 +270,7 @@ public class AuthenticationService
                         preparePreAuthenticationError( config.getEncryptionTypes() ) );
                 }
 
-                EncryptedTimeStamp timestamp = null;
+                PaEncTsEnc timestamp = null;
 
                 for ( int ii = 0; ii < preAuthData.size(); ii++ )
                 {
@@ -291,7 +292,7 @@ public class AuthenticationService
                             throw new KerberosException( ErrorType.KRB_AP_ERR_BAD_INTEGRITY,
cce );
                         }
 
-                        timestamp = ( EncryptedTimeStamp ) cipherTextHandler.unseal( EncryptedTimeStamp.class,
+                        timestamp = ( PaEncTimestamp ) cipherTextHandler.unseal( PaEncTimestamp.class,
                             clientKey, dataValue, KeyUsage.NUMBER1 );
                     }
                 }

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/TimestampChecker.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/TimestampChecker.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/TimestampChecker.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/TimestampChecker.java
Thu Dec  2 23:47:13 2010
@@ -28,11 +28,13 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
 import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
 import org.apache.directory.server.kerberos.shared.io.decoder.EncryptedDataDecoder;
-import org.apache.directory.server.kerberos.shared.messages.value.EncryptedTimeStamp;
 import org.apache.directory.shared.kerberos.KerberosTime;
 import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
 import org.apache.directory.shared.kerberos.components.EncryptedData;
 import org.apache.directory.shared.kerberos.components.EncryptionKey;
+import org.apache.directory.shared.kerberos.components.PaEncTsEnc;
+
+import sun.security.krb5.internal.PAEncTSEnc;
 
 
 /**
@@ -61,7 +63,7 @@ public class TimestampChecker implements
              * Decrypt the EncryptedData structure to get the PA-ENC-TS-ENC.  Decode the
              * decrypted timestamp into our timestamp object.
              */
-            EncryptedTimeStamp timestamp = ( EncryptedTimeStamp ) cipherTextHandler.unseal(
EncryptedTimeStamp.class,
+            PaEncTsEnc timestamp = ( PaEncTsEnc ) cipherTextHandler.unseal( PAEncTSEnc.class,
                 key, sadValue, KeyUsage.NUMBER1 );
 
             /*

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractAuthenticationServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractAuthenticationServiceTest.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractAuthenticationServiceTest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractAuthenticationServiceTest.java
Thu Dec  2 23:47:13 2010
@@ -29,7 +29,6 @@ import javax.security.auth.kerberos.Kerb
 
 import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
 import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
-import org.apache.directory.server.kerberos.shared.messages.value.EncryptedTimeStamp;
 import org.apache.directory.shared.kerberos.KerberosTime;
 import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
 import org.apache.directory.shared.kerberos.codec.types.PaDataType;
@@ -37,6 +36,7 @@ import org.apache.directory.shared.kerbe
 import org.apache.directory.shared.kerberos.components.EncryptedData;
 import org.apache.directory.shared.kerberos.components.EncryptionKey;
 import org.apache.directory.shared.kerberos.components.PaData;
+import org.apache.directory.shared.kerberos.components.PaEncTsEnc;
 import org.apache.directory.shared.kerberos.components.PrincipalName;
 import org.apache.mina.core.future.WriteFuture;
 import org.apache.mina.core.service.IoHandler;
@@ -72,7 +72,7 @@ public abstract class AbstractAuthentica
     {
         PaData[] paData = new PaData[1];
 
-        EncryptedTimeStamp encryptedTimeStamp = new EncryptedTimeStamp( timeStamp, 0 );
+        PaEncTsEnc encryptedTimeStamp = new PaEncTsEnc( timeStamp, 0 );
 
         EncryptionKey clientKey = getEncryptionKey( clientPrincipal, passPhrase );
 

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java
Thu Dec  2 23:47:13 2010
@@ -46,6 +46,7 @@ import org.apache.directory.shared.kerbe
 import org.apache.directory.shared.kerberos.codec.types.PaDataType;
 import org.apache.directory.shared.kerberos.codec.types.PrincipalNameType;
 import org.apache.directory.shared.kerberos.components.Checksum;
+import org.apache.directory.shared.kerberos.components.EncTicketPart;
 import org.apache.directory.shared.kerberos.components.EncryptedData;
 import org.apache.directory.shared.kerberos.components.EncryptionKey;
 import org.apache.directory.shared.kerberos.components.PaData;
@@ -203,13 +204,13 @@ public abstract class AbstractTicketGran
         throws Exception
     {
         // Get the session key from the service ticket.
-        sessionKey = tgt.getEncTicketPart().getSessionKey();
+        sessionKey = tgt.getEncTicketPart().getKey();
 
         // Generate a new sequence number.
         sequenceNumber = random.nextInt();
         now = new KerberosTime();
 
-        EncryptedData authenticator = getAuthenticator( tgt.getEncTicketPart().getClientPrincipal(),
requestBody, checksumType );
+        EncryptedData authenticator = getAuthenticator( tgt.getEncTicketPart().getcName(),
requestBody, checksumType );
 
         PaData[] paData = getPreAuthenticationData( tgt, authenticator );
 

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java
Thu Dec  2 23:47:13 2010
@@ -37,7 +37,6 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.messages.AuthenticationReply;
 import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
 import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
-import org.apache.directory.server.kerberos.shared.messages.value.EncryptedTimeStamp;
 import org.apache.directory.server.kerberos.shared.messages.value.KdcOptions;
 import org.apache.directory.server.kerberos.shared.messages.value.RequestBodyModifier;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
@@ -49,6 +48,7 @@ import org.apache.directory.shared.kerbe
 import org.apache.directory.shared.kerberos.components.EncryptionKey;
 import org.apache.directory.shared.kerberos.components.KdcReq;
 import org.apache.directory.shared.kerberos.components.PaData;
+import org.apache.directory.shared.kerberos.components.PaEncTsEnc;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -119,7 +119,7 @@ public class AuthenticationEncryptionTyp
         String passPhrase = "secret";
         PaData[] paData = getPreAuthEncryptedTimeStamp( clientPrincipal, passPhrase );
 
-        KdcReq message = new KdcRequest( KerberosConstants.KERBEROS_V5, KerberosMessageType.AS_REQ,
paData, modifier.getRequestBody() );
+        KdcReq message = new KdcReq( KerberosConstants.KERBEROS_V5, KerberosMessageType.AS_REQ,
paData, modifier.getRequestBody() );
 
         handler.messageReceived( session, message );
 
@@ -287,7 +287,7 @@ public class AuthenticationEncryptionTyp
     {
         PaData[] paData = new PaData[1];
 
-        EncryptedTimeStamp encryptedTimeStamp = new EncryptedTimeStamp( timeStamp, 0 );
+        PaEncTsEnc encryptedTimeStamp = new PaEncTsEnc( timeStamp, 0 );
 
         EncryptedData encryptedData = lockBox.seal( clientKey, encryptedTimeStamp, KeyUsage.NUMBER1
);
 

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java
Thu Dec  2 23:47:13 2010
@@ -29,7 +29,6 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
 import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
 import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
-import org.apache.directory.server.kerberos.shared.messages.value.EncryptedTimeStamp;
 import org.apache.directory.server.kerberos.shared.messages.value.KdcOptions;
 import org.apache.directory.server.kerberos.shared.messages.value.RequestBodyModifier;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
@@ -39,6 +38,7 @@ import org.apache.directory.shared.kerbe
 import org.apache.directory.shared.kerberos.components.EncryptedData;
 import org.apache.directory.shared.kerberos.components.EncryptionKey;
 import org.apache.directory.shared.kerberos.components.PaData;
+import org.apache.directory.shared.kerberos.components.PaEncTsEnc;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -271,7 +271,7 @@ public class PreAuthenticationTest exten
     {
         PaData[] paData = new PaData[1];
 
-        EncryptedTimeStamp encryptedTimeStamp = new EncryptedTimeStamp( timeStamp, 0 );
+        PaEncTsEnc encryptedTimeStamp = new PaEncTsEnc( timeStamp, 0 );
 
         EncryptionKey clientKey = getEncryptionKey( clientPrincipal, passPhrase );
 

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java?rev=1041650&r1=1041649&r2=1041650&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java
Thu Dec  2 23:47:13 2010
@@ -41,8 +41,6 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.messages.TicketGrantReply;
 import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier;
 import org.apache.directory.server.kerberos.shared.messages.components.Ticket;
-import org.apache.directory.shared.kerberos.components.HostAddress;
-import org.apache.directory.shared.kerberos.components.HostAddresses;
 import org.apache.directory.server.kerberos.shared.messages.value.KdcOptions;
 import org.apache.directory.server.kerberos.shared.messages.value.RequestBody;
 import org.apache.directory.server.kerberos.shared.messages.value.RequestBodyModifier;
@@ -52,6 +50,8 @@ import org.apache.directory.shared.kerbe
 import org.apache.directory.shared.kerberos.KerberosTime;
 import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
 import org.apache.directory.shared.kerberos.components.EncryptionKey;
+import org.apache.directory.shared.kerberos.components.HostAddress;
+import org.apache.directory.shared.kerberos.components.HostAddresses;
 import org.apache.directory.shared.kerberos.crypto.checksum.ChecksumType;
 import org.junit.After;
 import org.junit.Before;



Mime
View raw message