You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/12/09 01:38:25 UTC
svn commit: r1043805 [1/3] - in
/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory:
server/ server/kerberos/ server/kerberos/protocol/ server/kerberos/shared/
server/kerberos/shared/crypto/ server/kerberos/shared/crypto/checksu...
Author: elecharny
Date: Thu Dec 9 00:38:21 2010
New Revision: 1043805
URL: http://svn.apache.org/viewvc?rev=1043805&view=rev
Log:
Merged the kerberos-codec branch, 4
Added:
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/ (props changed)
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosDecoder.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosDecoder.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosEncoder.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosEncoder.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumEngine.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumEngine.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumHandler.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumHandler.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/Crc32Checksum.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/Crc32Checksum.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacMd5Checksum.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacMd5Checksum.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/RsaMd5Checksum.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/RsaMd5Checksum.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/package-info.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/package-info.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Aes128CtsSha1Encryption.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Aes128CtsSha1Encryption.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Aes256CtsSha1Encryption.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Aes256CtsSha1Encryption.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/AesCtsSha1Encryption.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/AesCtsSha1Encryption.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/ArcFourHmacMd5Encryption.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/ArcFourHmacMd5Encryption.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Des3CbcSha1KdEncryption.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Des3CbcSha1KdEncryption.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcCrcEncryption.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcCrcEncryption.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcMd5Encryption.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcMd5Encryption.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesStringToKey.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesStringToKey.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/EncryptionEngine.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/EncryptionEngine.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KerberosKeyFactory.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KerberosKeyFactory.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NFold.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NFold.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NullEncryption.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NullEncryption.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/RandomKeyFactory.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/RandomKeyFactory.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/package-info.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/package-info.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEncoder.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEncoder.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEntry.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEntry.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/ReplayCache.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/ReplayCache.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/ReplayCacheImpl.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/ReplayCacheImpl.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/package-info.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/package-info.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/DirectoryPrincipalStore.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/DirectoryPrincipalStore.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/KerberosAttribute.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/KerberosAttribute.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/KerberosCatalog.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/KerberosCatalog.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStore.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStore.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntry.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntry.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/package-info.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/package-info.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/package-info.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/package-info.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationDataEntry.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationDataEntry.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReqEntry.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReqEntry.java
Modified:
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosTime.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/actions/StoreNonce.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageGrammar.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apRep/ApRepContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/ApReqContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/StoreTicket.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asRep/AsRepContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asRep/actions/StoreKdcRep.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asReq/AsReqContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asReq/actions/StoreKdcReq.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/AuthenticatorContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/actions/StoreCusec.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/actions/StoreSeqNumber.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/EncApRepPartContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/actions/StoreCusec.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/actions/StoreSeqNumber.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encAsRepPart/EncAsRepPartContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encAsRepPart/actions/StoreEncAsRepPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/EncKrbCredPartContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/StoreNonce.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/StoreUsec.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/EncKrbPrivPartContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/actions/StoreSeqNumber.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/actions/StoreUsec.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTgsRepPart/EncTgsRepPartContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTgsRepPart/actions/StoreEncTgsRepPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/EncTicketPartContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreCName.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreCRealm.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreRenewtill.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/KdcRepContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/actions/CheckMsgType.java (props changed)
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/actions/StoreTicket.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/KdcReqContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/actions/StoreKdcReqBody.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/KdcReqBodyContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/AddTicket.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreNonce.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbCred/KrbCredContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbCred/actions/StoreTickets.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/KrbErrorContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCName.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCRealm.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCTime.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreCusec.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreEText.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreSName.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreSTime.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreSusec.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbPriv/KrbPrivContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbSafe/KrbSafeContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbSafeBody/actions/StoreSeqNumber.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbSafeBody/actions/StoreUsec.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/paEncTsEnc/actions/StorePaUsec.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/TgsRepContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/actions/StoreKdcRep.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/TgsReqContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/actions/StoreKdcReq.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/TicketContainer.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java (props changed)
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java (props changed)
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java (props changed)
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReq.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java (contents, props changed)
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java (props changed)
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/ (props changed)
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsRep.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java (contents, props changed)
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsRep.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java
Propchange: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Dec 9 00:38:21 2010
@@ -0,0 +1,4 @@
+/directory/apacheds/branches/apacheds-codec-merge/kerberos-shared/src/main/java/org/apache/directory/server:982369-987590
+/directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server:1023442-1029077
+/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server:980138-980936
+/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server:1040956-1043765
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosTime.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosTime.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosTime.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosTime.java Thu Dec 9 00:38:21 2010
@@ -19,14 +19,13 @@
*/
package org.apache.directory.shared.kerberos;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.Date;
import java.util.TimeZone;
-import java.util.regex.Pattern;
import org.apache.directory.shared.ldap.util.StringTools;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An specialization of the ASN.1 GeneralTime. The Kerberos time contains date and
@@ -35,22 +34,8 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class KerberosTime
+public class KerberosTime implements Comparable<KerberosTime>
{
- /** A logger for this class */
- private static final Logger LOG = LoggerFactory.getLogger( KerberosTime.class );
-
- /** The GeneralizedDate pattern matching */
- private static final String GENERALIZED_TIME_PATTERN =
- "^\\d{4}" // century + year : 0000 to 9999
- + "(0[1-9]|1[0-2])" // month : 01 to 12
- + "(0[1-9]|[12]\\d|3[01])" // day : 01 to 31
- + "([01]\\d|2[0-3])" // hour : 00 to 23
- + "([0-5]\\d)" // minute : 00 to 59
- + "([0-5]\\d)Z"; // second and UTC TZ
-
- /** The date pattern. The regexp pattern is immutable, only one instance needed. */
- private static final Pattern DATE_PATTERN = Pattern.compile( GENERALIZED_TIME_PATTERN );
/** The format for a KerberosTime */
private static final SimpleDateFormat sdf = new SimpleDateFormat( "yyyyMMddHHmmss'Z'" );
@@ -58,9 +43,24 @@ public class KerberosTime
/** The UTC timeZone */
private static final TimeZone UTC = TimeZone.getTimeZone( "UTC" );
- /** The KerberosTime */
+ /** The KerberosTime as a String*/
private String date;
+ /** The kerberosTime, as a long */
+ private long kerberosTime;
+
+ /** Constant for the {@link KerberosTime} "infinity." */
+ public static final KerberosTime INFINITY = new KerberosTime( Long.MAX_VALUE );
+
+ /** The number of milliseconds in a minute. */
+ public static final int MINUTE = 60000;
+
+ /** The number of milliseconds in a day. */
+ public static final int DAY = MINUTE * 1440;
+
+ /** The number of milliseconds in a week. */
+ public static final int WEEK = MINUTE * 10080;
+
// Initialize the dateFormat with the UTC TZ
static
{
@@ -73,6 +73,8 @@ public class KerberosTime
*/
public KerberosTime()
{
+ kerberosTime = (System.currentTimeMillis()/1000L)*1000L; // drop the ms
+ convertInternal( kerberosTime );
}
@@ -83,7 +85,14 @@ public class KerberosTime
*/
public KerberosTime( String date )
{
- setDate( date );
+ try
+ {
+ setDate( date );
+ }
+ catch ( ParseException pe )
+ {
+ throw new IllegalArgumentException( "Bad time : " + date );
+ }
}
@@ -92,30 +101,96 @@ public class KerberosTime
*/
public KerberosTime( long date )
{
+ convertInternal( date );
+ }
+
+
+ /**
+ * Creates a new instance of KerberosTime.
+ *
+ * @param time
+ */
+ public KerberosTime( Date time )
+ {
+ kerberosTime = (time.getTime()/1000L)*1000L; // drop the ms
+ convertInternal( kerberosTime );
+ }
+
+
+ /**
+ * converts the given milliseconds time to seconds and
+ * also formats the time to the generalized form
+ *
+ * @param date the time in milliseconds
+ */
+ private void convertInternal( long date )
+ {
Calendar calendar = Calendar.getInstance( UTC );
calendar.setTimeInMillis( date );
- this.date = sdf.format( calendar.getTime() );
+
+ synchronized ( sdf )
+ {
+ this.date = sdf.format( calendar.getTime() );
+ }
+
+ kerberosTime = (calendar.getTimeInMillis()/1000L)*1000L; // drop the ms
}
-
+
/**
- * Sets the date if it's a valid KerberosTime
- * @param date The date to store
+ * Returns the {@link KerberosTime} as a long.
+ *
+ * @return The {@link KerberosTime} as a long.
+ */
+ public long getTime()
+ {
+ return kerberosTime;
+ }
+
+
+ /**
+ * Returns the {@link KerberosTime} as a {@link Date}.
+ *
+ * @return The {@link KerberosTime} as a {@link Date}.
*/
- public void setDate( String date )
+ public Date toDate()
{
- boolean result = DATE_PATTERN.matcher( date ).find();
+ return new Date( kerberosTime );
+ }
- if ( result )
+
+ /**
+ * Returns the {@link KerberosTime} for a given zulu time.
+ *
+ * @param zuluTime
+ * @return The {@link KerberosTime}.
+ * @throws ParseException
+ */
+ public static KerberosTime getTime( String zuluTime ) throws ParseException
+ {
+ Date date = null;
+
+ synchronized ( sdf )
{
- this.date = date;
- LOG.debug( "Syntax valid for '{}'", date );
+ date = sdf.parse( zuluTime );
}
- else
+
+ return new KerberosTime( date );
+ }
+
+
+ /**
+ * Sets the date if it's a valid KerberosTime
+ * @param date The date to store
+ */
+ public void setDate( String date ) throws ParseException
+ {
+ synchronized ( sdf )
{
- LOG.debug( "Syntax invalid for '{}'", date );
- throw new IllegalArgumentException();
+ kerberosTime = sdf.parse( date ).getTime();
}
+
+ convertInternal( kerberosTime );
}
@@ -135,24 +210,12 @@ public class KerberosTime
{
return date;
}
-
-
- /**
- * {@inheritDoc}
- */
- public String toString()
- {
- return date;
- }
@Override
public int hashCode()
{
- final int prime = 31;
- int result = 1;
- result = prime * result + ( ( date == null ) ? 0 : date.hashCode() );
- return result;
+ return (int)kerberosTime;
}
@@ -171,18 +234,97 @@ public class KerberosTime
KerberosTime other = ( KerberosTime ) obj;
- if ( date == null )
+ return kerberosTime == other.kerberosTime;
+ }
+
+
+ /**
+ * Returns whether this {@link KerberosTime} is within the given clockskew.
+ *
+ * @param clockSkew
+ * @return true if this {@link KerberosTime} is within the given clockskew.
+ */
+ public boolean isInClockSkew( long clockSkew )
+ {
+ // The KerberosTime does not have milliseconds
+ long delta = Math.abs( kerberosTime - System.currentTimeMillis() );
+
+ return delta < clockSkew;
+ }
+
+
+ /**
+ * compares current kerberos time with the given kerberos time
+ * @param that the kerberos time against which the current kerberos time is compared
+ * @return 0 if both times are equal,<br>
+ * -1 if current time is less than the given time and<br>
+ * 1 if the given time is greater than the current time
+ */
+ public int compareTo( KerberosTime that )
+ {
+ final int BEFORE = -1;
+ final int EQUAL = 0;
+ final int AFTER = 1;
+
+ // this optimization is usually worthwhile, and can always be added
+ if ( this == that )
{
- if ( other.date != null )
- {
- return false;
- }
+ return EQUAL;
}
- else if ( !date.equals( other.date ) )
+
+ // primitive numbers follow this form
+ if ( this.kerberosTime < that.kerberosTime )
{
- return false;
+ return BEFORE;
}
-
- return true;
+
+ if ( this.kerberosTime > that.kerberosTime )
+ {
+ return AFTER;
+ }
+
+ return EQUAL;
+ }
+
+
+ /**
+ * checks if the current kerberos time is less or equal than the given kerberos time
+ * @param ktime the kerberos time against which the current kerberos time needs to be compared
+ * @return true if current kerberos time is less or equal than the given kerberos time, false otherwise
+ */
+ public boolean lessThan( KerberosTime ktime )
+ {
+ return kerberosTime <= ktime.kerberosTime;
+ }
+
+
+ /**
+ * checks if the current kerberos time is greater than the given kerberos time
+ * @param ktime the kerberos time against which the currnet kerberos time needs to be compared
+ * @return true if current kerberos time is greater than the given kerberos time, false otherwise
+ */
+ public boolean greaterThan( KerberosTime ktime )
+ {
+ return kerberosTime > ktime.kerberosTime;
+ }
+
+
+ /**
+ * Returns whether this {@link KerberosTime} is zero.
+ *
+ * @return true if this {@link KerberosTime} is zero.
+ */
+ public boolean isZero()
+ {
+ return kerberosTime == 0;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return date;
}
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartContainer.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartContainer.java Thu Dec 9 00:38:21 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.kerberos.codec.EncKdcRepPart;
+import java.nio.ByteBuffer;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.components.EncKdcRepPart;
@@ -35,10 +37,11 @@ public class EncKdcRepPartContainer exte
/**
* Creates a new EncKdcRepPartContainer object.
+ * @param stream The stream containing the data to decode
*/
- public EncKdcRepPartContainer()
+ public EncKdcRepPartContainer( ByteBuffer stream )
{
- super();
+ super( stream );
this.stateStack = new int[1];
this.grammar = EncKdcRepPartGrammar.getInstance();
setTransition( EncKdcRepPartStatesEnum.START_STATE );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/actions/StoreNonce.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/actions/StoreNonce.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/actions/StoreNonce.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/actions/StoreNonce.java Thu Dec 9 00:38:21 2010
@@ -37,7 +37,7 @@ public class StoreNonce extends Abstract
*/
public StoreNonce()
{
- super( "EncKdcRepPart nonce" );
+ super( "EncKdcRepPart nonce", Integer.MIN_VALUE, Integer.MAX_VALUE );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageGrammar.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageGrammar.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageGrammar.java Thu Dec 9 00:38:21 2010
@@ -42,7 +42,6 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.tgsRep.TgsRepContainer;
import org.apache.directory.shared.kerberos.codec.tgsReq.TgsReqContainer;
import org.apache.directory.shared.kerberos.messages.KerberosMessage;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -78,15 +77,13 @@ public final class KerberosMessageGramma
stream.rewind();
TLV tlv = kerberosMessageContainer.getCurrentTLV();
+ kerberosMessageContainer.setGrammarEndAllowed( true );
- // Now, dependening on the T, call the inner decoder
+ // Now, depending on the T, call the inner decoder
switch ( tlv.getTag() )
{
case KerberosConstants.AS_REQ_TAG :
- AsReqContainer asReqContainer = new AsReqContainer();
- asReqContainer.setStream( stream );
-
- System.out.println( StringTools.dumpBytes( stream.array() ) );
+ AsReqContainer asReqContainer = new AsReqContainer( stream );
// Decode the AS_REQ PDU
try
@@ -104,8 +101,7 @@ public final class KerberosMessageGramma
break;
case KerberosConstants.AS_REP_TAG :
- AsRepContainer asRepContainer = new AsRepContainer();
- asRepContainer.setStream( stream );
+ AsRepContainer asRepContainer = new AsRepContainer( stream );
// Decode the AS-REP PDU
try
@@ -123,8 +119,7 @@ public final class KerberosMessageGramma
break;
case KerberosConstants.TGS_REQ_TAG :
- TgsReqContainer tgsReqContainer = new TgsReqContainer();
- tgsReqContainer.setStream( stream );
+ TgsReqContainer tgsReqContainer = new TgsReqContainer( stream );
// Decode the TGS-REQ PDU
try
@@ -142,8 +137,7 @@ public final class KerberosMessageGramma
break;
case KerberosConstants.TGS_REP_TAG :
- TgsRepContainer tgsRepContainer = new TgsRepContainer();
- tgsRepContainer.setStream( stream );
+ TgsRepContainer tgsRepContainer = new TgsRepContainer( stream );
// Decode the TGS-REP PDU
try
@@ -161,8 +155,7 @@ public final class KerberosMessageGramma
break;
case KerberosConstants.AP_REQ_TAG :
- ApReqContainer apReqContainer = new ApReqContainer();
- apReqContainer.setStream( stream );
+ ApReqContainer apReqContainer = new ApReqContainer( stream );
// Decode the AP-REQ PDU
try
@@ -179,8 +172,7 @@ public final class KerberosMessageGramma
break;
case KerberosConstants.AP_REP_TAG :
- ApRepContainer apRepContainer = new ApRepContainer();
- apRepContainer.setStream( stream );
+ ApRepContainer apRepContainer = new ApRepContainer( stream );
// Decode the AP-REP PDU
try
@@ -197,8 +189,7 @@ public final class KerberosMessageGramma
break;
case KerberosConstants.KRB_SAFE_TAG :
- KrbSafeContainer krbSafeContainer = new KrbSafeContainer();
- krbSafeContainer.setStream( stream );
+ KrbSafeContainer krbSafeContainer = new KrbSafeContainer( stream );
// Decode the KRB-SAFE PDU
try
@@ -215,8 +206,7 @@ public final class KerberosMessageGramma
break;
case KerberosConstants.KRB_PRIV_TAG :
- KrbPrivContainer krbPrivContainer = new KrbPrivContainer();
- krbPrivContainer.setStream( stream );
+ KrbPrivContainer krbPrivContainer = new KrbPrivContainer( stream );
// Decode the KRB-PRIV PDU
try
@@ -233,8 +223,7 @@ public final class KerberosMessageGramma
break;
case KerberosConstants.KRB_CRED_TAG :
- KrbCredContainer krbCredContainer = new KrbCredContainer();
- krbCredContainer.setStream( stream );
+ KrbCredContainer krbCredContainer = new KrbCredContainer( stream );
// Decode the KRB-CRED PDU
try
@@ -251,8 +240,7 @@ public final class KerberosMessageGramma
break;
case KerberosConstants.KRB_ERROR_TAG :
- KrbErrorContainer krbErrorContainer = new KrbErrorContainer();
- krbErrorContainer.setStream( stream );
+ KrbErrorContainer krbErrorContainer = new KrbErrorContainer( stream );
// Decode the KRB-ERROR PDU
try
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apRep/ApRepContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apRep/ApRepContainer.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apRep/ApRepContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apRep/ApRepContainer.java Thu Dec 9 00:38:21 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.kerberos.codec.apRep;
+import java.nio.ByteBuffer;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.messages.ApRep;
@@ -35,10 +37,11 @@ public class ApRepContainer extends Abst
/**
* Creates a new ApRepContainer object.
+ * @param stream The stream containing the data to decode
*/
- public ApRepContainer()
+ public ApRepContainer( ByteBuffer stream )
{
- super();
+ super( stream );
this.stateStack = new int[1];
this.grammar = ApRepGrammar.getInstance();
setTransition( ApRepStatesEnum.START_STATE );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/ApReqContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/ApReqContainer.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/ApReqContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/ApReqContainer.java Thu Dec 9 00:38:21 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.kerberos.codec.apReq;
+import java.nio.ByteBuffer;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.messages.ApReq;
@@ -35,10 +37,11 @@ public class ApReqContainer extends Abst
/**
* Creates a new ApReqContainer object.
+ * @param stream The stream containing the data to decode
*/
- public ApReqContainer()
+ public ApReqContainer( ByteBuffer stream )
{
- super();
+ super( stream );
this.stateStack = new int[1];
this.grammar = ApReqGrammar.getInstance();
setTransition( ApReqStatesEnum.START_STATE );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/StoreTicket.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/StoreTicket.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/StoreTicket.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apReq/actions/StoreTicket.java Thu Dec 9 00:38:21 2010
@@ -77,8 +77,7 @@ public class StoreTicket extends Grammar
// Now, let's decode the Ticket
Asn1Decoder ticketDecoder = new Asn1Decoder();
- TicketContainer ticketContainer = new TicketContainer();
- ticketContainer.setStream( container.getStream() );
+ TicketContainer ticketContainer = new TicketContainer( container.getStream() );
// Decode the Ticket PDU
try
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asRep/AsRepContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asRep/AsRepContainer.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asRep/AsRepContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asRep/AsRepContainer.java Thu Dec 9 00:38:21 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.kerberos.codec.asRep;
+import java.nio.ByteBuffer;
+
import org.apache.directory.shared.kerberos.codec.kdcRep.KdcRepContainer;
import org.apache.directory.shared.kerberos.messages.AsRep;
@@ -35,10 +37,11 @@ public class AsRepContainer extends KdcR
/**
* Creates a new AsRepContainer object.
+ * @param stream The stream containing the data to decode
*/
- public AsRepContainer()
+ public AsRepContainer( ByteBuffer stream )
{
- super();
+ super( stream );
this.stateStack = new int[1];
this.grammar = AsRepGrammar.getInstance();
setTransition( AsRepStatesEnum.START_STATE );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asRep/actions/StoreKdcRep.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asRep/actions/StoreKdcRep.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asRep/actions/StoreKdcRep.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asRep/actions/StoreKdcRep.java Thu Dec 9 00:38:21 2010
@@ -78,8 +78,7 @@ public class StoreKdcRep extends Grammar
// Now, let's decode the KDC-REP
Asn1Decoder kdcRepDecoder = new Asn1Decoder();
- KdcRepContainer kdcRepContainer = new KdcRepContainer();
- kdcRepContainer.setStream( container.getStream() );
+ KdcRepContainer kdcRepContainer = new KdcRepContainer( container.getStream() );
// Store the created AS-REP object into the KDC-REP container
AsRep asRep = new AsRep();
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asReq/AsReqContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asReq/AsReqContainer.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asReq/AsReqContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asReq/AsReqContainer.java Thu Dec 9 00:38:21 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.kerberos.codec.asReq;
+import java.nio.ByteBuffer;
+
import org.apache.directory.shared.kerberos.codec.kdcReq.KdcReqContainer;
import org.apache.directory.shared.kerberos.messages.AsReq;
@@ -35,10 +37,11 @@ public class AsReqContainer extends KdcR
/**
* Creates a new AsReqContainer object.
+ * @param stream The stream containing the data to decode
*/
- public AsReqContainer()
+ public AsReqContainer( ByteBuffer stream )
{
- super();
+ super( stream );
this.stateStack = new int[1];
this.grammar = AsReqGrammar.getInstance();
setTransition( AsReqStatesEnum.START_STATE );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asReq/actions/StoreKdcReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asReq/actions/StoreKdcReq.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asReq/actions/StoreKdcReq.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/asReq/actions/StoreKdcReq.java Thu Dec 9 00:38:21 2010
@@ -78,8 +78,7 @@ public class StoreKdcReq extends Grammar
// Now, let's decode the KDC-REQ
Asn1Decoder kdcReqDecoder = new Asn1Decoder();
- KdcReqContainer kdcReqContainer = new KdcReqContainer();
- kdcReqContainer.setStream( container.getStream() );
+ KdcReqContainer kdcReqContainer = new KdcReqContainer( container.getStream() );
// Store the created AS-REQ object into the KDC-REQ container
AsReq asReq = new AsReq();
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/AuthenticatorContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/AuthenticatorContainer.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/AuthenticatorContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/AuthenticatorContainer.java Thu Dec 9 00:38:21 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.kerberos.codec.authenticator;
+import java.nio.ByteBuffer;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.messages.Authenticator;
@@ -35,10 +37,11 @@ public class AuthenticatorContainer exte
/**
* Creates a new AuthenticatorContainer object.
+ * @param stream The stream containing the data to decode
*/
- public AuthenticatorContainer()
+ public AuthenticatorContainer( ByteBuffer stream )
{
- super();
+ super( stream );
this.stateStack = new int[1];
this.grammar = AuthenticatorGrammar.getInstance();
setTransition( AuthenticatorStatesEnum.START_STATE );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/actions/StoreCusec.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/actions/StoreCusec.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/actions/StoreCusec.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/actions/StoreCusec.java Thu Dec 9 00:38:21 2010
@@ -38,7 +38,7 @@ public class StoreCusec extends Abstract
*/
public StoreCusec()
{
- super( "Authenticator cusec" );
+ super( "Authenticator cusec", 0, 999999 );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/actions/StoreSeqNumber.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/actions/StoreSeqNumber.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/actions/StoreSeqNumber.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/authenticator/actions/StoreSeqNumber.java Thu Dec 9 00:38:21 2010
@@ -38,7 +38,7 @@ public class StoreSeqNumber extends Abst
*/
public StoreSeqNumber()
{
- super( "Authenticator seq-number" );
+ super( "Authenticator seq-number", Integer.MIN_VALUE, Integer.MAX_VALUE );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/EncApRepPartContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/EncApRepPartContainer.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/EncApRepPartContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/EncApRepPartContainer.java Thu Dec 9 00:38:21 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.kerberos.codec.encApRepPart;
+import java.nio.ByteBuffer;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.messages.EncApRepPart;
@@ -35,10 +37,11 @@ public class EncApRepPartContainer exten
/**
* Creates a new EncApRepPartContainer object.
+ * @param stream The stream containing the data to decode
*/
- public EncApRepPartContainer()
+ public EncApRepPartContainer( ByteBuffer stream )
{
- super();
+ super( stream );
this.stateStack = new int[1];
this.grammar = EncApRepPartGrammar.getInstance();
setTransition( EncApRepPartStatesEnum.START_STATE );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/actions/StoreCusec.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/actions/StoreCusec.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/actions/StoreCusec.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/actions/StoreCusec.java Thu Dec 9 00:38:21 2010
@@ -38,7 +38,7 @@ public class StoreCusec extends Abstract
*/
public StoreCusec()
{
- super( "EncApRepPart cusec" );
+ super( "EncApRepPart cusec", 0, 999999 );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/actions/StoreSeqNumber.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/actions/StoreSeqNumber.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/actions/StoreSeqNumber.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encApRepPart/actions/StoreSeqNumber.java Thu Dec 9 00:38:21 2010
@@ -38,7 +38,7 @@ public class StoreSeqNumber extends Abst
*/
public StoreSeqNumber()
{
- super( "EncApRepPart seq-number" );
+ super( "EncApRepPart seq-number", Integer.MIN_VALUE, Integer.MAX_VALUE );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encAsRepPart/EncAsRepPartContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encAsRepPart/EncAsRepPartContainer.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encAsRepPart/EncAsRepPartContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encAsRepPart/EncAsRepPartContainer.java Thu Dec 9 00:38:21 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.kerberos.codec.encAsRepPart;
+import java.nio.ByteBuffer;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.messages.EncAsRepPart;
@@ -35,10 +37,11 @@ public class EncAsRepPartContainer exten
/**
* Creates a new EncAsRepPartContainer object.
+ * @param stream The stream containing the data to decode
*/
- public EncAsRepPartContainer()
+ public EncAsRepPartContainer( ByteBuffer stream )
{
- super();
+ super( stream );
this.stateStack = new int[1];
this.grammar = EncAsRepPartGrammar.getInstance();
setTransition( EncAsRepPartStatesEnum.START_STATE );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encAsRepPart/actions/StoreEncAsRepPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encAsRepPart/actions/StoreEncAsRepPart.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encAsRepPart/actions/StoreEncAsRepPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encAsRepPart/actions/StoreEncAsRepPart.java Thu Dec 9 00:38:21 2010
@@ -77,8 +77,7 @@ public class StoreEncAsRepPart extends G
// Now, let's decode the EncKdcRepPart
Asn1Decoder encKdcRepPartDecoder = new Asn1Decoder();
- EncKdcRepPartContainer encKdcRepPartContainer = new EncKdcRepPartContainer();
- encKdcRepPartContainer.setStream( container.getStream() );
+ EncKdcRepPartContainer encKdcRepPartContainer = new EncKdcRepPartContainer( container.getStream() );
// Decode the EncKdcRepPart PDU
try
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/EncKrbCredPartContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/EncKrbCredPartContainer.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/EncKrbCredPartContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/EncKrbCredPartContainer.java Thu Dec 9 00:38:21 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.kerberos.codec.encKrbCredPart;
+import java.nio.ByteBuffer;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.components.EncKrbCredPart;
@@ -35,10 +37,11 @@ public class EncKrbCredPartContainer ext
/**
* Creates a new EncKrbCredPartContainer object.
+ * @param stream The stream containing the data to decode
*/
- public EncKrbCredPartContainer()
+ public EncKrbCredPartContainer( ByteBuffer stream )
{
- super();
+ super( stream );
this.stateStack = new int[1];
this.grammar = EncKrbCredPartGrammar.getInstance();
setTransition( EncKrbCredPartStatesEnum.START_STATE );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/StoreNonce.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/StoreNonce.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/StoreNonce.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/StoreNonce.java Thu Dec 9 00:38:21 2010
@@ -37,7 +37,7 @@ public class StoreNonce extends Abstract
*/
public StoreNonce()
{
- super( "EncKrbCredPart nonce" );
+ super( "EncKrbCredPart nonce", Integer.MIN_VALUE, Integer.MAX_VALUE );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/StoreUsec.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/StoreUsec.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/StoreUsec.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbCredPart/actions/StoreUsec.java Thu Dec 9 00:38:21 2010
@@ -38,7 +38,7 @@ public class StoreUsec extends AbstractR
*/
public StoreUsec()
{
- super( "EncKrbCredPart usec" );
+ super( "EncKrbCredPart usec", 0, 999999 );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/EncKrbPrivPartContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/EncKrbPrivPartContainer.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/EncKrbPrivPartContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/EncKrbPrivPartContainer.java Thu Dec 9 00:38:21 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.kerberos.codec.encKrbPrivPart;
+import java.nio.ByteBuffer;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.components.EncKrbPrivPart;
@@ -35,10 +37,11 @@ public class EncKrbPrivPartContainer ext
/**
* Creates a new EncKrbPrivPartContainer object.
+ * @param stream The stream containing the data to decode
*/
- public EncKrbPrivPartContainer()
+ public EncKrbPrivPartContainer( ByteBuffer stream )
{
- super();
+ super( stream );
this.stateStack = new int[1];
this.grammar = EncKrbPrivPartGrammar.getInstance();
setTransition( EncKrbPrivPartStatesEnum.START_STATE );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/actions/StoreSeqNumber.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/actions/StoreSeqNumber.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/actions/StoreSeqNumber.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/actions/StoreSeqNumber.java Thu Dec 9 00:38:21 2010
@@ -38,7 +38,7 @@ public class StoreSeqNumber extends Abst
*/
public StoreSeqNumber()
{
- super( "EncKrbPrivPart seq-number" );
+ super( "EncKrbPrivPart seq-number", Integer.MIN_VALUE, Integer.MAX_VALUE );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/actions/StoreUsec.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/actions/StoreUsec.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/actions/StoreUsec.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encKrbPrivPart/actions/StoreUsec.java Thu Dec 9 00:38:21 2010
@@ -38,7 +38,7 @@ public class StoreUsec extends AbstractR
*/
public StoreUsec()
{
- super( "EncKrbPrivPart usec" );
+ super( "EncKrbPrivPart usec", 0, 999999 );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTgsRepPart/EncTgsRepPartContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTgsRepPart/EncTgsRepPartContainer.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTgsRepPart/EncTgsRepPartContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTgsRepPart/EncTgsRepPartContainer.java Thu Dec 9 00:38:21 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.kerberos.codec.encTgsRepPart;
+import java.nio.ByteBuffer;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.messages.EncTgsRepPart;
@@ -35,10 +37,11 @@ public class EncTgsRepPartContainer exte
/**
* Creates a new EncTgsRepPartContainer object.
+ * @param stream The stream containing the data to decode
*/
- public EncTgsRepPartContainer()
+ public EncTgsRepPartContainer( ByteBuffer stream )
{
- super();
+ super( stream );
this.stateStack = new int[1];
this.grammar = EncTgsRepPartGrammar.getInstance();
setTransition( EncTgsRepPartStatesEnum.START_STATE );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTgsRepPart/actions/StoreEncTgsRepPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTgsRepPart/actions/StoreEncTgsRepPart.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTgsRepPart/actions/StoreEncTgsRepPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTgsRepPart/actions/StoreEncTgsRepPart.java Thu Dec 9 00:38:21 2010
@@ -77,8 +77,7 @@ public class StoreEncTgsRepPart extends
// Now, let's decode the EncKdcRepPart
Asn1Decoder encKdcRepPartDecoder = new Asn1Decoder();
- EncKdcRepPartContainer encKdcRepPartContainer = new EncKdcRepPartContainer();
- encKdcRepPartContainer.setStream( container.getStream() );
+ EncKdcRepPartContainer encKdcRepPartContainer = new EncKdcRepPartContainer( container.getStream() );
// Decode the EncKdcRepPart PDU
try
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/EncTicketPartContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/EncTicketPartContainer.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/EncTicketPartContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/EncTicketPartContainer.java Thu Dec 9 00:38:21 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.kerberos.codec.encTicketPart;
+import java.nio.ByteBuffer;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.components.EncTicketPart;
@@ -35,10 +37,11 @@ public class EncTicketPartContainer exte
/**
* Creates a new EncTicketPartContainer object.
+ * @param stream The stream containing the data to decode
*/
- public EncTicketPartContainer()
+ public EncTicketPartContainer( ByteBuffer stream )
{
- super();
+ super( stream );
this.stateStack = new int[1];
this.grammar = EncTicketPartGrammar.getInstance();
setTransition( EncTicketPartStatesEnum.START_STATE );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreCName.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreCName.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreCName.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreCName.java Thu Dec 9 00:38:21 2010
@@ -49,6 +49,6 @@ public class StoreCName extends Abstract
protected void setPrincipalName( PrincipalName principalName, Asn1Container container )
{
EncTicketPartContainer encTicketPartContainer = ( EncTicketPartContainer ) container;
- encTicketPartContainer.getEncTicketPart().setcName( principalName );
+ encTicketPartContainer.getEncTicketPart().setCName( principalName );
}
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreCRealm.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreCRealm.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreCRealm.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreCRealm.java Thu Dec 9 00:38:21 2010
@@ -48,6 +48,6 @@ public class StoreCRealm extends Abstrac
protected void setRealm( String realm, Asn1Container container )
{
EncTicketPartContainer encTicketPartContainer = ( EncTicketPartContainer ) container;
- encTicketPartContainer.getEncTicketPart().setcRealm( realm );
+ encTicketPartContainer.getEncTicketPart().setCRealm( realm );
}
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreRenewtill.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreRenewtill.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreRenewtill.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/encTicketPart/actions/StoreRenewtill.java Thu Dec 9 00:38:21 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/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/KdcRepContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/KdcRepContainer.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/KdcRepContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/KdcRepContainer.java Thu Dec 9 00:38:21 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.kerberos.codec.kdcRep;
+import java.nio.ByteBuffer;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.components.KdcRep;
@@ -35,10 +37,11 @@ public class KdcRepContainer extends Abs
/**
* Creates a new KdcReqContainer object.
+ * @param stream The stream containing the data to decode
*/
- public KdcRepContainer()
+ public KdcRepContainer( ByteBuffer stream )
{
- super();
+ super( stream );
this.stateStack = new int[1];
this.grammar = KdcRepGrammar.getInstance();
setTransition( KdcRepStatesEnum.START_STATE );
Propchange: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/actions/CheckMsgType.java
('svn:mergeinfo' removed)
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/actions/StoreTicket.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/actions/StoreTicket.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/actions/StoreTicket.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcRep/actions/StoreTicket.java Thu Dec 9 00:38:21 2010
@@ -77,8 +77,7 @@ public class StoreTicket extends Grammar
// Now, let's decode the Ticket
Asn1Decoder ticketDecoder = new Asn1Decoder();
- TicketContainer ticketContainer = new TicketContainer();
- ticketContainer.setStream( container.getStream() );
+ TicketContainer ticketContainer = new TicketContainer( container.getStream() );
// Decode the Ticket PDU
try
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/KdcReqContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/KdcReqContainer.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/KdcReqContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/KdcReqContainer.java Thu Dec 9 00:38:21 2010
@@ -19,6 +19,8 @@
*/
package org.apache.directory.shared.kerberos.codec.kdcReq;
+import java.nio.ByteBuffer;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.components.KdcReq;
@@ -35,10 +37,11 @@ public class KdcReqContainer extends Abs
/**
* Creates a new KdcReqContainer object.
+ * @param stream The stream containing the data to decode
*/
- public KdcReqContainer()
+ public KdcReqContainer( ByteBuffer stream )
{
- super();
+ super( stream );
this.stateStack = new int[1];
this.grammar = KdcReqGrammar.getInstance();
setTransition( KdcReqStatesEnum.START_STATE );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/actions/StoreKdcReqBody.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/actions/StoreKdcReqBody.java?rev=1043805&r1=1043804&r2=1043805&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/actions/StoreKdcReqBody.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReq/actions/StoreKdcReqBody.java Thu Dec 9 00:38:21 2010
@@ -78,8 +78,7 @@ public class StoreKdcReqBody extends Gra
// Now, let's decode the KDC-REQ-BODY
Asn1Decoder kdcReqBodyDecoder = new Asn1Decoder();
- KdcReqBodyContainer kdcReqBodyContainer = new KdcReqBodyContainer();
- kdcReqBodyContainer.setStream( container.getStream() );
+ KdcReqBodyContainer kdcReqBodyContainer = new KdcReqBodyContainer( container.getStream() );
// Decode the KDC-REQ-BODY PDU
try