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 2012/01/24 17:15:29 UTC
svn commit: r1235326 [12/28] - in /directory/apacheds/trunk:
jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/
jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/
jdbm-partitio...
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/actions/StoreKdcRep.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/actions/StoreKdcRep.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/actions/StoreKdcRep.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsRep/actions/StoreKdcRep.java Tue Jan 24 16:15:05 2012
@@ -102,7 +102,6 @@ public class StoreKdcRep extends Grammar
throw new DecoderException( "Bad message type" );
}
-
tgsRepContainer.setTgsRep( tgsRep );
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/TgsReqContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/TgsReqContainer.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/TgsReqContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/TgsReqContainer.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos.codec.tgsReq;
+
import java.nio.ByteBuffer;
import org.apache.directory.shared.kerberos.codec.kdcReq.KdcReqContainer;
@@ -35,6 +36,7 @@ public class TgsReqContainer extends Kdc
/** An TGS-REQ container */
private TgsReq tgsReq;
+
/**
* Creates a new TgsReqContainer object.
* @param stream The stream containing the data to decode
@@ -56,7 +58,7 @@ public class TgsReqContainer extends Kdc
return tgsReq;
}
-
+
/**
* Set an TgsReq Object into the container. It will be completed by the
* KerberosDecoder.
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/TgsReqStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/TgsReqStatesEnum.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/TgsReqStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/tgsReq/TgsReqStatesEnum.java Tue Jan 24 16:15:05 2012
@@ -33,14 +33,13 @@ import org.apache.directory.shared.asn1.
public enum TgsReqStatesEnum implements States
{
// Start
- START_STATE, // 0
+ START_STATE, // 0
// ----- TGS-REQ message --------------------------------------
- TGS_REQ_STATE, // 1
+ TGS_REQ_STATE, // 1
// End
- LAST_TGS_REQ_STATE; // 2
-
+ LAST_TGS_REQ_STATE; // 2
/**
* Get the grammar name
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/TicketContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/TicketContainer.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/TicketContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/TicketContainer.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos.codec.ticket;
+
import java.nio.ByteBuffer;
import org.apache.directory.shared.asn1.ber.AbstractContainer;
@@ -36,7 +37,8 @@ public class TicketContainer extends Abs
{
/** The ticket */
private Ticket ticket;
-
+
+
/**
* Creates a new TicketContainer object. We will store one grammars,
* it's enough ...
@@ -59,7 +61,7 @@ public class TicketContainer extends Abs
return ticket;
}
-
+
/**
* Set a Ticket into the container. It will be completed by the
* KerberosDecoder.
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/TicketStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/TicketStatesEnum.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/TicketStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/TicketStatesEnum.java Tue Jan 24 16:15:05 2012
@@ -33,25 +33,24 @@ import org.apache.directory.shared.asn1.
public enum TicketStatesEnum implements States
{
// Start
- START_STATE, // 0
+ START_STATE, // 0
// ----- Ticket message --------------------------------------------
- TICKET_STATE, // 1
- TICKET_SEQ_STATE, // 2
+ TICKET_STATE, // 1
+ TICKET_SEQ_STATE, // 2
- TICKET_VNO_TAG_STATE, // 3
- TICKET_VNO_STATE, // 4
+ TICKET_VNO_TAG_STATE, // 3
+ TICKET_VNO_STATE, // 4
- TICKET_REALM_TAG_STATE, // 5
- TICKET_REALM_STATE, // 6
+ TICKET_REALM_TAG_STATE, // 5
+ TICKET_REALM_STATE, // 6
- TICKET_SNAME_TAG_STATE, // 7
+ TICKET_SNAME_TAG_STATE, // 7
- TICKET_ENC_PART_TAG_STATE, // 8
+ TICKET_ENC_PART_TAG_STATE, // 8
// End
- LAST_TICKET_STATE; // 9
-
+ LAST_TICKET_STATE; // 9
/**
* Get the grammar name
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/actions/TicketInit.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/actions/TicketInit.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/actions/TicketInit.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/actions/TicketInit.java Tue Jan 24 16:15:05 2012
@@ -40,6 +40,7 @@ public class TicketInit extends GrammarA
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( TicketInit.class );
+
/**
* Instantiates a new TicketInit action.
*/
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/TransitedEncodingContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/TransitedEncodingContainer.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/TransitedEncodingContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/TransitedEncodingContainer.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos.codec.transitedEncoding;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.components.TransitedEncoding;
@@ -33,6 +34,7 @@ public class TransitedEncodingContainer
/** An EncryptedData container */
private TransitedEncoding transitedEncoding;
+
/**
* Creates a new TransitedEncodingContainer object.
*/
@@ -53,7 +55,7 @@ public class TransitedEncodingContainer
return transitedEncoding;
}
-
+
/**
* Set a TransitedEncoding Object into the container. It will be completed by the
* KerberosDecoder.
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/TransitedEncodingStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/TransitedEncodingStatesEnum.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/TransitedEncodingStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/transitedEncoding/TransitedEncodingStatesEnum.java Tue Jan 24 16:15:05 2012
@@ -33,20 +33,19 @@ import org.apache.directory.shared.asn1.
public enum TransitedEncodingStatesEnum implements States
{
// Start
- START_STATE, // 0
+ START_STATE, // 0
// ----- TransitedEncoding message --------------------------------------
- TRANSITED_ENCODING_SEQ_STATE, // 1
+ TRANSITED_ENCODING_SEQ_STATE, // 1
- TRANSITED_ENCODING_TR_TYPE_TAG_STATE, // 2
- TRANSITED_ENCODING_TR_TYPE_STATE, // 3
+ TRANSITED_ENCODING_TR_TYPE_TAG_STATE, // 2
+ TRANSITED_ENCODING_TR_TYPE_STATE, // 3
- TRANSITED_ENCODING_CONTENTS_TAG_STATE, // 4
- TRANSITED_ENCODING_CONTENTS_STATE, // 5
+ TRANSITED_ENCODING_CONTENTS_TAG_STATE, // 4
+ TRANSITED_ENCODING_CONTENTS_STATE, // 5
// End
- LAST_TRANSITED_ENCODING_STATE; // 6
-
+ LAST_TRANSITED_ENCODING_STATE; // 6
/**
* Get the grammar name
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/TypedDataContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/TypedDataContainer.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/TypedDataContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/TypedDataContainer.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos.codec.typedData;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.components.TypedData;
@@ -33,6 +34,7 @@ public class TypedDataContainer extends
/** An TypedData container */
private TypedData typedData;
+
/**
* Creates a new TypedDataContainer object.
*/
@@ -53,7 +55,7 @@ public class TypedDataContainer extends
return typedData;
}
-
+
/**
* Set a TypedData Object into the container. It will be completed by the
* KerberosDecoder.
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/TypedDataStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/TypedDataStatesEnum.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/TypedDataStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/TypedDataStatesEnum.java Tue Jan 24 16:15:05 2012
@@ -33,21 +33,20 @@ import org.apache.directory.shared.asn1.
public enum TypedDataStatesEnum implements States
{
// Start
- START_STATE, // 0
+ START_STATE, // 0
- TYPED_DATA_SEQ_STATE, // 1
+ TYPED_DATA_SEQ_STATE, // 1
- TYPED_DATA_SEQ_SEQ_STATE, // 2
+ TYPED_DATA_SEQ_SEQ_STATE, // 2
- TYPED_DATA_TDTYPE_TAG_STATE, // 3
- TYPED_DATA_TDTYPE_STATE, // 4
+ TYPED_DATA_TDTYPE_TAG_STATE, // 3
+ TYPED_DATA_TDTYPE_STATE, // 4
- TYPED_DATA_TDDATA_TAG_STATE, // 5
- TYPED_DATA_TDDATA_STATE, // 6
+ TYPED_DATA_TDDATA_TAG_STATE, // 5
+ TYPED_DATA_TDDATA_STATE, // 6
// End
- LAST_TYPED_DATA_STATE; // 7
-
+ LAST_TYPED_DATA_STATE; // 7
/**
* Get the grammar name
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/actions/TypedDataInit.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/actions/TypedDataInit.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/actions/TypedDataInit.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/typedData/actions/TypedDataInit.java Tue Jan 24 16:15:05 2012
@@ -74,7 +74,6 @@ public class TypedDataInit extends Gramm
TypedData typedData = new TypedData();
typedDataContainer.setTypedData( typedData );
-
if ( IS_DEBUG )
{
LOG.debug( "TypedData created" );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/AuthorizationType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/AuthorizationType.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/AuthorizationType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/AuthorizationType.java Tue Jan 24 16:15:05 2012
@@ -29,99 +29,98 @@ public enum AuthorizationType
/**
* Constant for the "null" authorization type.
*/
- NULL( 0 ),
+ NULL(0),
/**
* Constant for the "if relevant" authorization type.
*
* RFC 4120
*/
- AD_IF_RELEVANT( 1 ),
+ AD_IF_RELEVANT(1),
/**
* Constant for the "intended for server" authorization type.
*
* RFC 4120
*/
- AD_INTENDED_FOR_SERVER( 2 ),
+ AD_INTENDED_FOR_SERVER(2),
/**
* Constant for the "intended for application class" authorization type.
*
* RFC 4120
*/
- AD_INTENDED_FOR_APPLICATION_CLASS( 3 ),
+ AD_INTENDED_FOR_APPLICATION_CLASS(3),
/**
* Constant for the "kdc issued" authorization type.
*
* RFC 4120
*/
- AD_KDC_ISSUED( 4 ),
+ AD_KDC_ISSUED(4),
/**
* Constant for the "or" authorization type.
*
* RFC 4120
*/
- AD_OR( 5 ),
+ AD_OR(5),
/**
* Constant for the "mandatory ticket extensions" authorization type.
*
* RFC 4120
*/
- AD_MANDATORY_TICKET_EXTENSIONS( 6 ),
+ AD_MANDATORY_TICKET_EXTENSIONS(6),
/**
* Constant for the "in ticket extensions" authorization type.
*
* RFC 4120
*/
- AD_IN_TICKET_EXTENSIONS( 7 ),
+ AD_IN_TICKET_EXTENSIONS(7),
/**
* Constant for the "mandatory-for-kdc" authorization type.
*
* RFC 4120
*/
- AD_MANDATORY_FOR_KDC( 8 ),
+ AD_MANDATORY_FOR_KDC(8),
/**
* Constant for the "OSF DCE" authorization type.
*
* RFC 1510
*/
- OSF_DCE( 64 ),
+ OSF_DCE(64),
/**
* Constant for the "sesame" authorization type.
*
* RFC 1510
*/
- SESAME( 65 ),
+ SESAME(65),
/**
* Constant for the "OSF-DCE pki certid" authorization type.
*
* RFC 1510
*/
- AD_OSF_DCE_PKI_CERTID( 66 ),
+ AD_OSF_DCE_PKI_CERTID(66),
/**
* Constant for the "sesame" authorization type.
*
* RFC 1510
*/
- AD_WIN2K_PAC( 128 ),
+ AD_WIN2K_PAC(128),
/**
* Constant for the "sesame" authorization type.
*
* RFC 1510
*/
- AD_ETYPE_NEGOTIATION( 129 );
-
+ AD_ETYPE_NEGOTIATION(129);
/**
* The value/code for the authorization type.
@@ -148,20 +147,34 @@ public enum AuthorizationType
{
switch ( type )
{
- case 1 : return AD_IF_RELEVANT;
- case 2 : return AD_INTENDED_FOR_SERVER;
- case 3 : return AD_INTENDED_FOR_APPLICATION_CLASS;
- case 4 : return AD_KDC_ISSUED;
- case 5 : return AD_OR;
- case 6 : return AD_MANDATORY_TICKET_EXTENSIONS;
- case 7 : return AD_IN_TICKET_EXTENSIONS;
- case 8 : return AD_MANDATORY_FOR_KDC;
- case 64 : return OSF_DCE;
- case 65 : return SESAME;
- case 66 : return AD_OSF_DCE_PKI_CERTID;
- case 128 : return AD_WIN2K_PAC;
- case 129 : return AD_ETYPE_NEGOTIATION;
- default : return NULL;
+ case 1:
+ return AD_IF_RELEVANT;
+ case 2:
+ return AD_INTENDED_FOR_SERVER;
+ case 3:
+ return AD_INTENDED_FOR_APPLICATION_CLASS;
+ case 4:
+ return AD_KDC_ISSUED;
+ case 5:
+ return AD_OR;
+ case 6:
+ return AD_MANDATORY_TICKET_EXTENSIONS;
+ case 7:
+ return AD_IN_TICKET_EXTENSIONS;
+ case 8:
+ return AD_MANDATORY_FOR_KDC;
+ case 64:
+ return OSF_DCE;
+ case 65:
+ return SESAME;
+ case 66:
+ return AD_OSF_DCE_PKI_CERTID;
+ case 128:
+ return AD_WIN2K_PAC;
+ case 129:
+ return AD_ETYPE_NEGOTIATION;
+ default:
+ return NULL;
}
}
@@ -175,8 +188,8 @@ public enum AuthorizationType
{
return value;
}
-
-
+
+
/**
* @see Object#toString()
*/
@@ -184,46 +197,46 @@ public enum AuthorizationType
{
switch ( this )
{
- case AD_IF_RELEVANT :
+ case AD_IF_RELEVANT:
return "if relevant" + "(" + value + ")";
-
- case AD_INTENDED_FOR_SERVER :
+
+ case AD_INTENDED_FOR_SERVER:
return "intended for server" + "(" + value + ")";
-
- case AD_INTENDED_FOR_APPLICATION_CLASS :
+
+ case AD_INTENDED_FOR_APPLICATION_CLASS:
return "intended for application class" + "(" + value + ")";
-
- case AD_KDC_ISSUED :
+
+ case AD_KDC_ISSUED:
return "kdc issued" + "(" + value + ")";
-
- case AD_OR :
+
+ case AD_OR:
return "or" + "(" + value + ")";
-
- case AD_MANDATORY_TICKET_EXTENSIONS :
+
+ case AD_MANDATORY_TICKET_EXTENSIONS:
return "mandatory ticket extensions" + "(" + value + ")";
-
- case AD_IN_TICKET_EXTENSIONS :
+
+ case AD_IN_TICKET_EXTENSIONS:
return "in ticket extensions" + "(" + value + ")";
-
- case AD_MANDATORY_FOR_KDC :
+
+ case AD_MANDATORY_FOR_KDC:
return "mandatory-for-kdc" + "(" + value + ")";
-
- case OSF_DCE :
+
+ case OSF_DCE:
return "OSF DCE" + "(" + value + ")";
-
- case SESAME :
+
+ case SESAME:
return "sesame" + "(" + value + ")";
-
- case AD_OSF_DCE_PKI_CERTID :
+
+ case AD_OSF_DCE_PKI_CERTID:
return "OSF DCE pki certid" + "(" + value + ")";
-
- case AD_WIN2K_PAC :
+
+ case AD_WIN2K_PAC:
return "win 2000 PAC" + "(" + value + ")";
-
- case AD_ETYPE_NEGOTIATION :
+
+ case AD_ETYPE_NEGOTIATION:
return "etype negociation" + "(" + value + ")";
-
- default :
+
+ default:
return "null" + "(" + value + ")";
}
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/EncryptionType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/EncryptionType.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/EncryptionType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/EncryptionType.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos.codec.types;
+
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -26,7 +27,6 @@ import java.util.Map;
import org.apache.directory.shared.util.Strings;
-
/**
* A type-safe enumeration of Kerberos encryption types.
*
@@ -37,127 +37,127 @@ public enum EncryptionType
/**
* The "unknown" encryption type.
*/
- UNKNOWN( -1, "UNKNOWN" ),
+ UNKNOWN(-1, "UNKNOWN"),
/**
* The "null" encryption type.
*/
- NULL( 0, "null" ),
+ NULL(0, "null"),
/**
* The des-cbc-crc encryption type.
*/
- DES_CBC_CRC( 1, "des-cbc-crc" ),
+ DES_CBC_CRC(1, "des-cbc-crc"),
/**
* The des-cbc-md4 encryption type.
*/
- DES_CBC_MD4( 2, "des-cbc-md4" ),
+ DES_CBC_MD4(2, "des-cbc-md4"),
/**
* The des-cbc-md5 encryption type.
*/
- DES_CBC_MD5( 3, "des-cbc-md5" ),
+ DES_CBC_MD5(3, "des-cbc-md5"),
/**
* The reserved (4) encryption type.
*/
- RESERVED4( 4, "[reserved]" ),
+ RESERVED4(4, "[reserved]"),
/**
* The des3-cbc-md5 encryption type.
*/
- DES3_CBC_MD5( 5, "des3-cbc-md5" ),
+ DES3_CBC_MD5(5, "des3-cbc-md5"),
/**
* The reserved (6) encryption type.
*/
- RESERVED6( 6, "[reserved]" ),
+ RESERVED6(6, "[reserved]"),
/**
* The des3-cbc-sha1 encryption type.
*/
- DES3_CBC_SHA1( 7, "des3-cbc-sha1" ),
+ DES3_CBC_SHA1(7, "des3-cbc-sha1"),
/**
* The dsaWithSHA1-CmsOID encryption type.
*/
- DSAWITHSHA1_CMSOID( 9, "dsaWithSHA1-CmsOID" ),
+ DSAWITHSHA1_CMSOID(9, "dsaWithSHA1-CmsOID"),
/**
* The md5WithRSAEncryption-CmsOID encryption type.
*/
- MD5WITHRSAENCRYPTION_CMSOID( 10, "md5WithRSAEncryption-CmsOID" ),
+ MD5WITHRSAENCRYPTION_CMSOID(10, "md5WithRSAEncryption-CmsOID"),
/**
* The sha1WithRSAEncryption-CmsOID encryption type.
*/
- SHA1WITHRSAENCRYPTION_CMSOID( 11, "sha1WithRSAEncryption-CmsOID" ),
+ SHA1WITHRSAENCRYPTION_CMSOID(11, "sha1WithRSAEncryption-CmsOID"),
/**
* The rc2CBC-EnvOID encryption type.
*/
- RC2CBC_ENVOID( 12, "rc2CBC-EnvOID" ),
+ RC2CBC_ENVOID(12, "rc2CBC-EnvOID"),
/**
* The rsaEncryption-EnvOID encryption type.
*/
- RSAENCRYPTION_ENVOID( 13, "rsaEncryption-EnvOID" ),
+ RSAENCRYPTION_ENVOID(13, "rsaEncryption-EnvOID"),
/**
* The rsaES-OAEP-ENV-OID encryption type.
*/
- RSAES_OAEP_ENV_OID( 14, "rsaES-OAEP-ENV-OID" ),
+ RSAES_OAEP_ENV_OID(14, "rsaES-OAEP-ENV-OID"),
/**
* The des-ede3-cbc-Env-OID encryption type.
*/
- DES_EDE3_CBC_ENV_OID( 15, "des-ede3-cbc-Env-OID" ),
+ DES_EDE3_CBC_ENV_OID(15, "des-ede3-cbc-Env-OID"),
/**
* The des3-cbc-sha1-kd encryption type.
*/
- DES3_CBC_SHA1_KD( 16, "des3-cbc-sha1-kd" ),
+ DES3_CBC_SHA1_KD(16, "des3-cbc-sha1-kd"),
/**
* The aes128-cts-hmac-sha1-96 encryption type.
*/
- AES128_CTS_HMAC_SHA1_96( 17, "aes128-cts-hmac-sha1-96" ),
+ AES128_CTS_HMAC_SHA1_96(17, "aes128-cts-hmac-sha1-96"),
/**
* The aes256-cts-hmac-sha1-96 encryption type.
*/
- AES256_CTS_HMAC_SHA1_96( 18, "aes256-cts-hmac-sha1-96" ),
+ AES256_CTS_HMAC_SHA1_96(18, "aes256-cts-hmac-sha1-96"),
/**
* The rc4-hmac encryption type.
*/
- RC4_HMAC( 23, "rc4-hmac" ),
+ RC4_HMAC(23, "rc4-hmac"),
/**
* The rc4-hmac-exp encryption type.
*/
- RC4_HMAC_EXP( 24, "rc4-hmac-exp" ),
+ RC4_HMAC_EXP(24, "rc4-hmac-exp"),
/**
* The subkey-keymaterial encryption type.
*/
- SUBKEY_KEYMATERIAL( 65, "subkey-keymaterial" ),
+ SUBKEY_KEYMATERIAL(65, "subkey-keymaterial"),
/**
* The rc4-md4 encryption type.
*/
- RC4_MD4( -128, "rc4-md4" ),
+ RC4_MD4(-128, "rc4-md4"),
/**
* The c4-hmac-old encryption type.
*/
- RC4_HMAC_OLD( -133, "rc4-hmac-old" ),
+ RC4_HMAC_OLD(-133, "rc4-hmac-old"),
/**
* The rc4-hmac-old-exp encryption type.
*/
- RC4_HMAC_OLD_EXP( -135, "rc4-hmac-old-exp" );
+ RC4_HMAC_OLD_EXP(-135, "rc4-hmac-old-exp");
/**
* The value/code for the encryption type.
@@ -195,7 +195,7 @@ public enum EncryptionType
this.name = name;
}
-
+
/**
* Get all the encryption types
*
@@ -206,6 +206,7 @@ public enum EncryptionType
return encryptionTypesByName.values();
}
+
/**
* Returns the encryption type when specified by its value.
*
@@ -246,6 +247,7 @@ public enum EncryptionType
return name;
}
+
/**
* Get the EncryptionType given a String.
* @param type The encryption string we want to find
@@ -257,9 +259,9 @@ public enum EncryptionType
{
return UNKNOWN;
}
-
+
String lcType = Strings.toLowerCase( type );
-
+
if ( encryptionTypesByName.containsKey( lcType ) )
{
return encryptionTypesByName.get( lcType );
@@ -269,8 +271,8 @@ public enum EncryptionType
return UNKNOWN;
}
}
-
-
+
+
/**
* @see Object#toString()
*/
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/HostAddrType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/HostAddrType.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/HostAddrType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/HostAddrType.java Tue Jan 24 16:15:05 2012
@@ -51,7 +51,7 @@ public enum HostAddrType
/**
* Constant for the "null" host address type.
*/
- NULL( 0 ),
+ NULL(0),
/**
* Constant for the "Unix" host address type.
@@ -63,12 +63,12 @@ public enum HostAddrType
/**
* Constant for the "Internet" host address type.
*/
- ADDRTYPE_INET( 2 ),
+ ADDRTYPE_INET(2),
/**
* Constant for the "Arpanet" host address type.
*/
- ADDRTYPE_IMPLINK( 3 ),
+ ADDRTYPE_IMPLINK(3),
/**
* Constant for the "PUP" host address type.
@@ -80,12 +80,12 @@ public enum HostAddrType
/**
* Constant for the "CHAOS" host address type.
*/
- ADDRTYPE_CHAOS( 5 ),
+ ADDRTYPE_CHAOS(5),
/**
* Constant for the "XEROX Network Services" host address type.
*/
- ADDRTYPE_XNS( 6 ),
+ ADDRTYPE_XNS(6),
/**
* Constant for the "IPX" host address type.
@@ -97,7 +97,7 @@ public enum HostAddrType
/**
* Constant for the "OSI" host address type.
*/
- ADDRTYPE_OSI( 7 ),
+ ADDRTYPE_OSI(7),
/**
* Constant for the "European Computer Manufacturers" host address type.
@@ -130,7 +130,7 @@ public enum HostAddrType
/**
* Constant for the "DECnet" host address type.
*/
- ADDRTYPE_DECNET( 12 ),
+ ADDRTYPE_DECNET(12),
/**
* Constant for the "Direct Data Link Interface" host address type.
@@ -156,7 +156,7 @@ public enum HostAddrType
/**
* Constant for the "AppleTalk" host address type.
*/
- ADDRTYPE_APPLETALK( 16 ),
+ ADDRTYPE_APPLETALK(16),
/**
* Constant for the "VoiceView" host address type.
@@ -177,7 +177,7 @@ public enum HostAddrType
*
* Not in RFC
*/
- ADDRTYPE_NETBIOS( 20 ),
+ ADDRTYPE_NETBIOS(20),
/**
* Constant for the "Banyan" host address type.
@@ -196,7 +196,7 @@ public enum HostAddrType
/**
* Constant for the "Internet Protocol V6" host address type.
*/
- ADDRTYPE_INET6( 24 );
+ ADDRTYPE_INET6(24);
/**
* The value/code for the host address type.
@@ -223,30 +223,41 @@ public enum HostAddrType
{
switch ( type )
{
- case 0 : return NULL;
- //case 1 : return ADDRTYPE_UNIX;
- case 2 : return ADDRTYPE_INET;
- case 3 : return ADDRTYPE_IMPLINK;
- //case 4 : return ADDRTYPE_PUP;
- case 5 : return ADDRTYPE_CHAOS;
- case 6 : return ADDRTYPE_XNS;
- case 7 : return ADDRTYPE_OSI;
- //case 8 : return ADDRTYPE_ECMA;
- //case 9 : return ADDRTYPE_DATAKIT;
- //case 10 : return pADDRTYPE_CCITT;
- //case 11 : return ADDRTYPE_SNA;
- case 12 : return ADDRTYPE_DECNET;
- //case 13 : return ADDRTYPE_DLI;
- //case 14 : return ADDRTYPE_LAT;
- //case 15 : return ADDRTYPE_HYLINK;
- case 16 : return ADDRTYPE_APPLETALK;
- //case 18 : return ADDRTYPE_VOICEVIEW;
- //case 19 : return ADDRTYPE_FIREFOX;
- case 20 : return ADDRTYPE_NETBIOS;
- //case 21 : return ADDRTYPE_BAN;
- //case 22 : return ADDRTYPE_ATM;
- case 24 : return ADDRTYPE_INET6;
- default : return NULL;
+ case 0:
+ return NULL;
+ //case 1 : return ADDRTYPE_UNIX;
+ case 2:
+ return ADDRTYPE_INET;
+ case 3:
+ return ADDRTYPE_IMPLINK;
+ //case 4 : return ADDRTYPE_PUP;
+ case 5:
+ return ADDRTYPE_CHAOS;
+ case 6:
+ return ADDRTYPE_XNS;
+ case 7:
+ return ADDRTYPE_OSI;
+ //case 8 : return ADDRTYPE_ECMA;
+ //case 9 : return ADDRTYPE_DATAKIT;
+ //case 10 : return pADDRTYPE_CCITT;
+ //case 11 : return ADDRTYPE_SNA;
+ case 12:
+ return ADDRTYPE_DECNET;
+ //case 13 : return ADDRTYPE_DLI;
+ //case 14 : return ADDRTYPE_LAT;
+ //case 15 : return ADDRTYPE_HYLINK;
+ case 16:
+ return ADDRTYPE_APPLETALK;
+ //case 18 : return ADDRTYPE_VOICEVIEW;
+ //case 19 : return ADDRTYPE_FIREFOX;
+ case 20:
+ return ADDRTYPE_NETBIOS;
+ //case 21 : return ADDRTYPE_BAN;
+ //case 22 : return ADDRTYPE_ATM;
+ case 24:
+ return ADDRTYPE_INET6;
+ default:
+ return NULL;
}
}
@@ -261,6 +272,7 @@ public enum HostAddrType
return value;
}
+
/**
* {@inheritDoc}
*/
@@ -268,29 +280,38 @@ public enum HostAddrType
{
switch ( value )
{
- //case 1 : return "Unix" + "(" + value + ")" ;
- case 2 : return "Internet" + "(" + value + ")" ;
- case 3 : return "Arpanet" + "(" + value + ")" ;
- //case 4 : return "PUP" + "(" + value + ")" ;
- case 5 : return "CHAOS" + "(" + value + ")" ;
- case 6 : return "XEROX Network Services" + "(" + value + ")" ;
- case 7 : return "OSI" + "(" + value + ")" ;
- //case 8 : return "European Computer Manufacturers" + "(" + value + ")" ;
- //case 9 : return "Datakit" + "(" + value + ")" ;
- //case 10 : return "CCITT" + "(" + value + ")" ;
- //case 11 : return "SNA" + "(" + value + ")" ;
- case 12 : return "DECnet" + "(" + value + ")" ;
- //case 13 : return "Direct Data Link Interface" + "(" + value + ")" ;
- //case 14 : return "LAT" + "(" + value + ")" ;
- //case 15 : return "NSC Hyperchannel" + "(" + value + ")" ;
- //case 16 : return "AppleTalk" + "(" + value + ")" ;
- //case 18 : return "VoiceView" + "(" + value + ")" ;
- //case 19 : return "Firefox" + "(" + value + ")" ;
- case 20 : return "NetBios" + "(" + value + ")" ;
- //case 21 : return "Banyan" + "(" + value + ")" ;
- //case 22 : return "ATM" + "(" + value + ")" ;
- case 24 : return "Internet Protocol V6" + "(" + value + ")" ;
- default : return "null" + "(" + value + ")" ;
+ //case 1 : return "Unix" + "(" + value + ")" ;
+ case 2:
+ return "Internet" + "(" + value + ")";
+ case 3:
+ return "Arpanet" + "(" + value + ")";
+ //case 4 : return "PUP" + "(" + value + ")" ;
+ case 5:
+ return "CHAOS" + "(" + value + ")";
+ case 6:
+ return "XEROX Network Services" + "(" + value + ")";
+ case 7:
+ return "OSI" + "(" + value + ")";
+ //case 8 : return "European Computer Manufacturers" + "(" + value + ")" ;
+ //case 9 : return "Datakit" + "(" + value + ")" ;
+ //case 10 : return "CCITT" + "(" + value + ")" ;
+ //case 11 : return "SNA" + "(" + value + ")" ;
+ case 12:
+ return "DECnet" + "(" + value + ")";
+ //case 13 : return "Direct Data Link Interface" + "(" + value + ")" ;
+ //case 14 : return "LAT" + "(" + value + ")" ;
+ //case 15 : return "NSC Hyperchannel" + "(" + value + ")" ;
+ //case 16 : return "AppleTalk" + "(" + value + ")" ;
+ //case 18 : return "VoiceView" + "(" + value + ")" ;
+ //case 19 : return "Firefox" + "(" + value + ")" ;
+ case 20:
+ return "NetBios" + "(" + value + ")";
+ //case 21 : return "Banyan" + "(" + value + ")" ;
+ //case 22 : return "ATM" + "(" + value + ")" ;
+ case 24:
+ return "Internet Protocol V6" + "(" + value + ")";
+ default:
+ return "null" + "(" + value + ")";
}
}
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/LastReqType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/LastReqType.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/LastReqType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/LastReqType.java Tue Jan 24 16:15:05 2012
@@ -32,37 +32,37 @@ public enum LastReqType
/**
* Constant for the "none" last request type.
*/
- NONE ( 0, AuthenticationLevel.NONE.toString() ),
+ NONE(0, AuthenticationLevel.NONE.toString()),
/**
* Constant for the "time of initial ticket" last request type.
*/
- TIME_OF_INITIAL_TGT ( 1, "time of initial ticket" ),
+ TIME_OF_INITIAL_TGT(1, "time of initial ticket"),
/**
* Constant for the "time of initial request" last request type.
*/
- TIME_OF_INITIAL_REQ ( 2, "time of initial request" ),
+ TIME_OF_INITIAL_REQ(2, "time of initial request"),
/**
* Constant for the "time of newest ticket" last request type.
*/
- TIME_OF_NEWEST_TGT ( 3, "time of newest ticket" ),
+ TIME_OF_NEWEST_TGT(3, "time of newest ticket"),
/**
* Constant for the "time of last renewal" last request type.
*/
- TIME_OF_LAST_RENEWAL ( 4, "time of last renewal" ),
+ TIME_OF_LAST_RENEWAL(4, "time of last renewal"),
/**
* Constant for the "time of last request" last request type.
*/
- TIME_OF_LAST_REQ ( 5, "time of last request" ),
+ TIME_OF_LAST_REQ(5, "time of last request"),
/**
* Constant for the "time of password expiration" last request type.
*/
- TIME_OF_PASSWORD_EXP ( 6, "time of password expiration" );
+ TIME_OF_PASSWORD_EXP(6, "time of password expiration");
/**
* The name of the checksum type.
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java Tue Jan 24 16:15:05 2012
@@ -28,93 +28,92 @@ public enum PaDataType
/**
* Constant for the "null" pre-authentication data type.
*/
- NULL( 0 ),
+ NULL(0),
/**
* Constant for the "TGS request" pre-authentication data type.
*/
- PA_TGS_REQ( 1 ),
+ PA_TGS_REQ(1),
/**
* Constant for the "encrypted timestamp" pre-authentication data type.
*/
- PA_ENC_TIMESTAMP( 2 ),
+ PA_ENC_TIMESTAMP(2),
/**
* Constant for the "password salt" pre-authentication data type.
*/
- PA_PW_SALT( 3 ),
+ PA_PW_SALT(3),
/**
* Constant for the "enc unix time" pre-authentication data type.
*/
- PA_ENC_UNIX_TIME( 5 ),
+ PA_ENC_UNIX_TIME(5),
/**
* Constant for the "sandia secureid" pre-authentication data type.
*/
- PA_SANDIA_SECUREID( 6 ),
+ PA_SANDIA_SECUREID(6),
/**
* Constant for the "sesame" pre-authentication data type.
*/
- PA_SESAME( 7 ),
+ PA_SESAME(7),
/**
* Constant for the "OSF DCE" pre-authentication data type.
*/
- PA_OSF_DCE( 8 ),
+ PA_OSF_DCE(8),
/**
* Constant for the "cybersafe secureid" pre-authentication data type.
*/
- PA_CYBERSAFE_SECUREID( 9 ),
+ PA_CYBERSAFE_SECUREID(9),
/**
* Constant for the "ASF3 salt" pre-authentication data type.
*/
- PA_ASF3_SALT( 10 ),
+ PA_ASF3_SALT(10),
/**
* Constant for the "encryption info" pre-authentication data type.
*/
- PA_ENCTYPE_INFO( 11 ),
+ PA_ENCTYPE_INFO(11),
/**
* Constant for the "SAM challenge" pre-authentication data type.
*/
- SAM_CHALLENGE( 12 ),
+ SAM_CHALLENGE(12),
/**
* Constant for the "SAM response" pre-authentication data type.
*/
- SAM_RESPONSE( 13 ),
+ SAM_RESPONSE(13),
/**
* Constant for the "PK as request" pre-authentication data type.
*/
- PA_PK_AS_REQ( 14 ),
+ PA_PK_AS_REQ(14),
/**
* Constant for the "PK as response" pre-authentication data type.
*/
- PA_PK_AS_REP( 15 ),
+ PA_PK_AS_REP(15),
/**
* Constant for the "use specified key version" pre-authentication data type.
*/
- PA_USE_SPECIFIED_KVNO( 20 ),
+ PA_USE_SPECIFIED_KVNO(20),
/**
* Constant for the "SAM redirect" pre-authentication data type.
*/
- SAM_REDIRECT( 21 ),
+ SAM_REDIRECT(21),
/**
* Constant for the "get from typed data" pre-authentication data type.
*/
- PA_GET_FROM_TYPED_DATA( 22 );
-
+ PA_GET_FROM_TYPED_DATA(22);
/**
* The value/code for the pre-authentication type.
@@ -140,7 +139,8 @@ public enum PaDataType
{
return value;
}
-
+
+
/**
* Returns the pre authentication data type when specified by its ordinal.
*
@@ -151,27 +151,46 @@ public enum PaDataType
{
switch ( type )
{
- case 1 : return PA_TGS_REQ;
- case 2 : return PA_ENC_TIMESTAMP;
- case 3 : return PA_PW_SALT;
- case 5 : return PA_ENC_UNIX_TIME;
- case 6 : return PA_SANDIA_SECUREID;
- case 7 : return PA_SESAME;
- case 8 : return PA_OSF_DCE;
- case 9 : return PA_CYBERSAFE_SECUREID;
- case 10 : return PA_ASF3_SALT;
- case 11 : return PA_ENCTYPE_INFO;
- case 12 : return SAM_CHALLENGE;
- case 13 : return SAM_RESPONSE;
- case 14 : return PA_PK_AS_REQ;
- case 15 : return PA_PK_AS_REQ;
- case 20 : return PA_USE_SPECIFIED_KVNO;
- case 21 : return SAM_REDIRECT;
- case 22 : return PA_GET_FROM_TYPED_DATA;
- default : return NULL;
+ case 1:
+ return PA_TGS_REQ;
+ case 2:
+ return PA_ENC_TIMESTAMP;
+ case 3:
+ return PA_PW_SALT;
+ case 5:
+ return PA_ENC_UNIX_TIME;
+ case 6:
+ return PA_SANDIA_SECUREID;
+ case 7:
+ return PA_SESAME;
+ case 8:
+ return PA_OSF_DCE;
+ case 9:
+ return PA_CYBERSAFE_SECUREID;
+ case 10:
+ return PA_ASF3_SALT;
+ case 11:
+ return PA_ENCTYPE_INFO;
+ case 12:
+ return SAM_CHALLENGE;
+ case 13:
+ return SAM_RESPONSE;
+ case 14:
+ return PA_PK_AS_REQ;
+ case 15:
+ return PA_PK_AS_REQ;
+ case 20:
+ return PA_USE_SPECIFIED_KVNO;
+ case 21:
+ return SAM_REDIRECT;
+ case 22:
+ return PA_GET_FROM_TYPED_DATA;
+ default:
+ return NULL;
}
}
+
/**
* @see Object#toString()
*/
@@ -179,58 +198,58 @@ public enum PaDataType
{
switch ( this )
{
- case PA_TGS_REQ :
+ case PA_TGS_REQ:
return "TGS request." + "(" + value + ")";
-
- case PA_ENC_TIMESTAMP :
+
+ case PA_ENC_TIMESTAMP:
return "Encrypted timestamp." + "(" + value + ")";
-
- case PA_PW_SALT :
+
+ case PA_PW_SALT:
return "password salt" + "(" + value + ")";
-
- case PA_ENC_UNIX_TIME :
+
+ case PA_ENC_UNIX_TIME:
return "enc unix time" + "(" + value + ")";
-
- case PA_SANDIA_SECUREID :
+
+ case PA_SANDIA_SECUREID:
return "sandia secureid" + "(" + value + ")";
-
- case PA_SESAME :
+
+ case PA_SESAME:
return "sesame" + "(" + value + ")";
-
- case PA_OSF_DCE :
+
+ case PA_OSF_DCE:
return "OSF DCE" + "(" + value + ")";
-
- case PA_CYBERSAFE_SECUREID :
+
+ case PA_CYBERSAFE_SECUREID:
return "cybersafe secureid" + "(" + value + ")";
-
- case PA_ASF3_SALT :
+
+ case PA_ASF3_SALT:
return "ASF3 salt" + "(" + value + ")";
-
- case PA_ENCTYPE_INFO :
+
+ case PA_ENCTYPE_INFO:
return "Encryption info." + "(" + value + ")";
-
- case SAM_CHALLENGE :
+
+ case SAM_CHALLENGE:
return "SAM challenge." + "(" + value + ")";
-
- case SAM_RESPONSE :
+
+ case SAM_RESPONSE:
return "SAM response." + "(" + value + ")";
-
- case PA_PK_AS_REQ :
+
+ case PA_PK_AS_REQ:
return "PK as request" + "(" + value + ")";
-
- case PA_PK_AS_REP :
+
+ case PA_PK_AS_REP:
return "PK as response" + "(" + value + ")";
-
- case PA_USE_SPECIFIED_KVNO :
+
+ case PA_USE_SPECIFIED_KVNO:
return "use specified key version" + "(" + value + ")";
-
- case SAM_REDIRECT :
+
+ case SAM_REDIRECT:
return "SAM redirect." + "(" + value + ")";
-
- case PA_GET_FROM_TYPED_DATA :
+
+ case PA_GET_FROM_TYPED_DATA:
return "Get from typed data" + "(" + value + ")";
-
- default :
+
+ default:
return "null" + "(" + value + ")";
}
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PrincipalNameType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PrincipalNameType.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PrincipalNameType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PrincipalNameType.java Tue Jan 24 16:15:05 2012
@@ -43,31 +43,31 @@ package org.apache.directory.shared.kerb
public enum PrincipalNameType
{
/** Constant for the "Name type not known" principal name type. */
- KRB_NT_UNKNOWN( 0 ),
+ KRB_NT_UNKNOWN(0),
/**Constant for the "Just the name of the principal as in DCE, or for users" principal name type. */
- KRB_NT_PRINCIPAL( 1 ),
+ KRB_NT_PRINCIPAL(1),
/** Constant for the "Service and other unique instance (krbtgt)" principal name type. */
- KRB_NT_SRV_INST( 2 ),
+ KRB_NT_SRV_INST(2),
/** Constant for the "Service with host name as instance (telnet, rcommands)" principal name type. */
- KRB_NT_SRV_HST( 3 ),
+ KRB_NT_SRV_HST(3),
/** Constant for the "Service with host as remaining components" principal name type. */
- KRB_NT_SRV_XHST( 4 ),
+ KRB_NT_SRV_XHST(4),
/** Constant for the "Unique ID" principal name type. */
- KRB_NT_UID( 5 ),
+ KRB_NT_UID(5),
/** Constant for the "Encoded X.509 Distinguished name [RFC2253]" principal name type. */
- KRB_NT_X500_PRINCIPAL( 6 ),
+ KRB_NT_X500_PRINCIPAL(6),
/** Constant for the "Name in form of SMTP email name (e.g., user@example.com)" principal name type. */
- KRB_NT_SMTP_NAME( 7 ),
+ KRB_NT_SMTP_NAME(7),
/** Constant for the "Enterprise name; may be mapped to principal name" principal name type. */
- KRB_NT_ENTERPRISE( 10 );
+ KRB_NT_ENTERPRISE(10);
/**
* The value/code for the principal name type.
@@ -94,16 +94,26 @@ public enum PrincipalNameType
{
switch ( type )
{
- case 0 : return KRB_NT_UNKNOWN;
- case 1 : return KRB_NT_PRINCIPAL;
- case 2 : return KRB_NT_SRV_INST;
- case 3 : return KRB_NT_SRV_HST;
- case 4 : return KRB_NT_SRV_XHST;
- case 5 : return KRB_NT_UID;
- case 6 : return KRB_NT_X500_PRINCIPAL;
- case 7 : return KRB_NT_SMTP_NAME;
- case 10 : return KRB_NT_ENTERPRISE;
- default : return KRB_NT_UNKNOWN;
+ case 0:
+ return KRB_NT_UNKNOWN;
+ case 1:
+ return KRB_NT_PRINCIPAL;
+ case 2:
+ return KRB_NT_SRV_INST;
+ case 3:
+ return KRB_NT_SRV_HST;
+ case 4:
+ return KRB_NT_SRV_XHST;
+ case 5:
+ return KRB_NT_UID;
+ case 6:
+ return KRB_NT_X500_PRINCIPAL;
+ case 7:
+ return KRB_NT_SMTP_NAME;
+ case 10:
+ return KRB_NT_ENTERPRISE;
+ default:
+ return KRB_NT_UNKNOWN;
}
}
@@ -118,6 +128,7 @@ public enum PrincipalNameType
return value;
}
+
/**
* @see Object#toString()
*/
@@ -125,34 +136,34 @@ public enum PrincipalNameType
{
switch ( this )
{
- case KRB_NT_UNKNOWN :
+ case KRB_NT_UNKNOWN:
return "Name type not known" + "(" + value + ")";
-
- case KRB_NT_PRINCIPAL :
+
+ case KRB_NT_PRINCIPAL:
return "Just the name of the principal as in DCE, or for users" + "(" + value + ")";
-
- case KRB_NT_SRV_INST :
+
+ case KRB_NT_SRV_INST:
return "Service and other unique instance (krbtgt)" + "(" + value + ")";
-
- case KRB_NT_SRV_HST :
+
+ case KRB_NT_SRV_HST:
return "Service with host name as instance (telnet, rcommands)" + "(" + value + ")";
-
- case KRB_NT_SRV_XHST :
+
+ case KRB_NT_SRV_XHST:
return "Service with host as remaining components" + "(" + value + ")";
-
- case KRB_NT_UID :
+
+ case KRB_NT_UID:
return "Unique ID" + "(" + value + ")";
-
- case KRB_NT_X500_PRINCIPAL :
+
+ case KRB_NT_X500_PRINCIPAL:
return "Encoded X.509 Distinguished name [RFC2253]" + "(" + value + ")";
-
- case KRB_NT_SMTP_NAME :
+
+ case KRB_NT_SMTP_NAME:
return "Name in form of SMTP email name (e.g., user@example.com)" + "(" + value + ")";
-
- case KRB_NT_ENTERPRISE :
+
+ case KRB_NT_ENTERPRISE:
return "Enterprise name; may be mapped to principal name" + "(" + value + ")";
-
- default :
+
+ default:
return "unknown name type" + "(" + value + ")";
}
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java Tue Jan 24 16:15:05 2012
@@ -20,8 +20,6 @@
package org.apache.directory.shared.kerberos.codec.types;
-
-
/**
* Type safe enumeration of Single-use Authentication Mechanism types
*
@@ -35,25 +33,25 @@ public enum SamType
*/
/** safe SAM type enum for Enigma Logic */
- PA_SAM_TYPE_ENIGMA ( 1, "Enigma Logic" ),
+ PA_SAM_TYPE_ENIGMA(1, "Enigma Logic"),
/** safe SAM type enum for Digital Pathways */
- PA_SAM_TYPE_DIGI_PATH ( 2, "Digital Pathways" ),
+ PA_SAM_TYPE_DIGI_PATH(2, "Digital Pathways"),
/** safe SAM type enum for S/key where KDC has key 0 */
- PA_SAM_TYPE_SKEY_K0 ( 3, "S/key where KDC has key 0" ),
+ PA_SAM_TYPE_SKEY_K0(3, "S/key where KDC has key 0"),
/** safe SAM type enum for Traditional S/Key */
- PA_SAM_TYPE_SKEY ( 4, "Traditional S/Key" ),
+ PA_SAM_TYPE_SKEY(4, "Traditional S/Key"),
/** safe SAM type enum for Security Dynamics */
- PA_SAM_TYPE_SECURID ( 5, "Security Dynamics" ),
+ PA_SAM_TYPE_SECURID(5, "Security Dynamics"),
/** safe SAM type enum for CRYPTOCard */
- PA_SAM_TYPE_CRYPTOCARD ( 6, "CRYPTOCard" ),
+ PA_SAM_TYPE_CRYPTOCARD(6, "CRYPTOCard"),
/** safe SAM type enum for Apache Software Foundation */
- PA_SAM_TYPE_APACHE ( 7, "Apache Software Foundation" );
+ PA_SAM_TYPE_APACHE(7, "Apache Software Foundation");
/** the name of the sam type */
private String name;
@@ -91,7 +89,7 @@ public enum SamType
*/
public static SamType getTypeByOrdinal( int ordinal )
{
- for ( SamType st : SamType.values())
+ for ( SamType st : SamType.values() )
{
if ( ordinal == st.getOrdinal() )
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/TransitedEncodingType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/TransitedEncodingType.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/TransitedEncodingType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/TransitedEncodingType.java Tue Jan 24 16:15:05 2012
@@ -28,10 +28,10 @@ package org.apache.directory.shared.kerb
public enum TransitedEncodingType
{
/** Constant for the "null" transited encoding type. */
- NULL( 0 ),
+ NULL(0),
/** Constant for the "Domain X500 compress" transited encoding type. */
- DOMAIN_X500_COMPRESS( 1 );
+ DOMAIN_X500_COMPRESS(1);
/**
* The value/code for the transited encoding type.
@@ -58,10 +58,10 @@ public enum TransitedEncodingType
{
switch ( type )
{
- case 1 :
+ case 1:
return DOMAIN_X500_COMPRESS;
-
- default :
+
+ default:
return NULL;
}
}
@@ -77,6 +77,7 @@ public enum TransitedEncodingType
return value;
}
+
/**
* @see Object#toString()
*/
@@ -84,10 +85,10 @@ public enum TransitedEncodingType
{
switch ( this )
{
- case DOMAIN_X500_COMPRESS :
+ case DOMAIN_X500_COMPRESS:
return "Domain X500 compress (1)";
-
- default :
+
+ default:
return "null (0)";
}
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos.components;
+
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
@@ -33,6 +34,7 @@ import org.apache.directory.shared.util.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
/**
* The AdAndOr structure is used to store a AD-AND-OR associated to a type.
*
@@ -55,7 +57,7 @@ public class AdAndOr extends AbstractAsn
/** The condition-count */
private int conditionCount;
-
+
/** The elements */
private AuthorizationData elements;
@@ -64,6 +66,7 @@ public class AdAndOr extends AbstractAsn
private int elementsTagLength;
private int adAndOrSeqLength;
+
/**
* Creates a new instance of AdAndOr
*/
@@ -80,7 +83,7 @@ public class AdAndOr extends AbstractAsn
return conditionCount;
}
-
+
/**
* @param conditionCount the conditionCount to set
*/
@@ -89,7 +92,7 @@ public class AdAndOr extends AbstractAsn
this.conditionCount = conditionCount;
}
-
+
/**
* @return the elements
*/
@@ -98,7 +101,7 @@ public class AdAndOr extends AbstractAsn
return elements;
}
-
+
/**
* @param elements the elements to set
*/
@@ -106,8 +109,8 @@ public class AdAndOr extends AbstractAsn
{
this.elements = elements;
}
-
-
+
+
/**
* Compute the AD-AND-OR length
* <pre>
@@ -128,11 +131,11 @@ public class AdAndOr extends AbstractAsn
// Compute the condition count length
int conditionCountLength = Value.getNbBytes( conditionCount );
conditionCountTagLength = 1 + TLV.getNbBytes( conditionCountLength ) + conditionCountLength;
- adAndOrSeqLength = 1 + TLV.getNbBytes( conditionCountTagLength ) + conditionCountTagLength;
+ adAndOrSeqLength = 1 + TLV.getNbBytes( conditionCountTagLength ) + conditionCountTagLength;
// Compute the elements length
elementsTagLength = elements.computeLength();
- adAndOrSeqLength += 1 + TLV.getNbBytes( elementsTagLength ) + elementsTagLength;
+ adAndOrSeqLength += 1 + TLV.getNbBytes( elementsTagLength ) + elementsTagLength;
// Compute the whole sequence length
return 1 + TLV.getNbBytes( adAndOrSeqLength ) + adAndOrSeqLength;
@@ -159,16 +162,16 @@ public class AdAndOr extends AbstractAsn
// The AD-AND-OR SEQ OF Tag
buffer.put( UniversalTag.SEQUENCE.getValue() );
buffer.put( TLV.getBytes( adAndOrSeqLength ) );
-
+
// the condition-count
buffer.put( ( byte ) KerberosConstants.AD_AND_OR_CONDITION_COUNT_TAG );
- buffer.put( (byte)conditionCountTagLength );
+ buffer.put( ( byte ) conditionCountTagLength );
Value.encode( buffer, conditionCount );
// the elements
buffer.put( ( byte ) KerberosConstants.AD_AND_OR_ELEMENTS_TAG );
- buffer.put( (byte)elementsTagLength );
-
+ buffer.put( ( byte ) elementsTagLength );
+
elements.encode( buffer );
}
catch ( BufferOverflowException boe )
@@ -180,7 +183,7 @@ public class AdAndOr extends AbstractAsn
if ( IS_DEBUG )
{
- LOG.debug( "AD-AND-OR encoding : {}", Strings.dumpBytes(buffer.array()) );
+ LOG.debug( "AD-AND-OR encoding : {}", Strings.dumpBytes( buffer.array() ) );
LOG.debug( "AD-AND-OR initial value : {}", toString() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdIfRelevant.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdIfRelevant.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdIfRelevant.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdIfRelevant.java Tue Jan 24 16:15:05 2012
@@ -20,8 +20,6 @@
package org.apache.directory.shared.kerberos.components;
-
-
/**
* The AdIfRelevant structure is used to store a AD-IF-RELEVANT associated to a type.
*
@@ -41,7 +39,7 @@ public class AdIfRelevant extends Author
super();
}
-
+
/**
* @see Object#toString()
*/
@@ -59,7 +57,7 @@ public class AdIfRelevant extends Author
StringBuilder sb = new StringBuilder();
sb.append( tabs ).append( "AD-IF-RELEVANT : {\n" );
- sb.append( tabs ).append( super.toString( " " + tabs) ).append( '\n' );
+ sb.append( tabs ).append( super.toString( " " + tabs ) ).append( '\n' );
sb.append( tabs + "}\n" );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos.components;
+
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
@@ -32,6 +33,7 @@ import org.apache.directory.shared.util.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
/**
* The AdKdcIssued structure is used to store a AD-KDCIssued associated to a type.
*
@@ -56,16 +58,15 @@ public class AdKdcIssued extends Abstrac
/** The checksum */
private Checksum adChecksum;
-
+
/** The realm */
private String irealm;
-
+
/** The PrincipalName */
private PrincipalName isname;
-
+
/** The AuthorizationData */
private AuthorizationData elements;
-
// Storage for computed lengths
private int adCheksumTagLength;
@@ -75,6 +76,7 @@ public class AdKdcIssued extends Abstrac
private int elementsTagLength;
private int adKdcIssuedSeqLength;
+
/**
* Creates a new instance of AdKdcIssued
*/
@@ -91,7 +93,7 @@ public class AdKdcIssued extends Abstrac
return elements;
}
-
+
/**
* @param elements the elements to set
*/
@@ -99,8 +101,6 @@ public class AdKdcIssued extends Abstrac
{
this.elements = elements;
}
-
-
/**
@@ -156,7 +156,7 @@ public class AdKdcIssued extends Abstrac
this.isname = isname;
}
-
+
/**
* Compute the AD-KDCIssued length
* <pre>
@@ -184,26 +184,26 @@ public class AdKdcIssued extends Abstrac
{
// Compute the ad-cheksum count length
adCheksumTagLength = adChecksum.computeLength();
- adKdcIssuedSeqLength = 1 + TLV.getNbBytes( adCheksumTagLength ) + adCheksumTagLength;
+ adKdcIssuedSeqLength = 1 + TLV.getNbBytes( adCheksumTagLength ) + adCheksumTagLength;
// Compute the i-realm length, if any
if ( irealm != null )
{
irealmBytes = irealm.getBytes();
- irealmTagLength = 1 + TLV.getNbBytes( irealmBytes.length ) + irealmBytes.length;
- adKdcIssuedSeqLength += 1 + TLV.getNbBytes( irealmTagLength ) + irealmTagLength;
+ irealmTagLength = 1 + TLV.getNbBytes( irealmBytes.length ) + irealmBytes.length;
+ adKdcIssuedSeqLength += 1 + TLV.getNbBytes( irealmTagLength ) + irealmTagLength;
}
// Compute the i-sname length, if any
if ( isname != null )
{
isnameTagLength = isname.computeLength();
- adKdcIssuedSeqLength += 1 + TLV.getNbBytes( isnameTagLength ) + isnameTagLength;
+ adKdcIssuedSeqLength += 1 + TLV.getNbBytes( isnameTagLength ) + isnameTagLength;
}
// Compute the elements count length
elementsTagLength = elements.computeLength();
- adKdcIssuedSeqLength += 1 + TLV.getNbBytes( elementsTagLength ) + elementsTagLength;
+ adKdcIssuedSeqLength += 1 + TLV.getNbBytes( elementsTagLength ) + elementsTagLength;
// Compute the whole sequence length
return 1 + TLV.getNbBytes( adKdcIssuedSeqLength ) + adKdcIssuedSeqLength;
@@ -230,19 +230,19 @@ public class AdKdcIssued extends Abstrac
// The AD-KDCIssued SEQ Tag
buffer.put( UniversalTag.SEQUENCE.getValue() );
buffer.put( TLV.getBytes( adKdcIssuedSeqLength ) );
-
+
// the ad-checksum
buffer.put( ( byte ) KerberosConstants.AD_KDC_ISSUED_AD_CHECKSUM_TAG );
- buffer.put( (byte)adCheksumTagLength );
+ buffer.put( ( byte ) adCheksumTagLength );
adChecksum.encode( buffer );
// the i-realm, if any
if ( irealm != null )
{
buffer.put( ( byte ) KerberosConstants.AD_KDC_ISSUED_I_REALM_TAG );
- buffer.put( (byte)irealmTagLength );
+ buffer.put( ( byte ) irealmTagLength );
buffer.put( UniversalTag.GENERAL_STRING.getValue() );
- buffer.put( (byte)irealmBytes.length );
+ buffer.put( ( byte ) irealmBytes.length );
buffer.put( irealmBytes );
}
@@ -250,13 +250,13 @@ public class AdKdcIssued extends Abstrac
if ( isname != null )
{
buffer.put( ( byte ) KerberosConstants.AD_KDC_ISSUED_I_SNAME_TAG );
- buffer.put( (byte)isnameTagLength );
+ buffer.put( ( byte ) isnameTagLength );
isname.encode( buffer );
}
// the elements
buffer.put( ( byte ) KerberosConstants.AD_KDC_ISSUED_ELEMENTS_TAG );
- buffer.put( (byte)elementsTagLength );
+ buffer.put( ( byte ) elementsTagLength );
elements.encode( buffer );
}
catch ( BufferOverflowException boe )
@@ -268,7 +268,7 @@ public class AdKdcIssued extends Abstrac
if ( IS_DEBUG )
{
- LOG.debug( "AD-KDCIssued encoding : {}", Strings.dumpBytes(buffer.array()) );
+ LOG.debug( "AD-KDCIssued encoding : {}", Strings.dumpBytes( buffer.array() ) );
LOG.debug( "AD-KDCIssued initial value : {}", toString() );
}
@@ -294,18 +294,17 @@ public class AdKdcIssued extends Abstrac
sb.append( tabs ).append( "AD-KDCIssued : {\n" );
sb.append( tabs ).append( " ad-cheksum: " ).append( adChecksum.toString( tabs + " " ) ).append( '\n' );
-
+
if ( irealm != null )
{
sb.append( tabs ).append( " i-realm: " ).append( irealm ).append( '\n' );
}
-
-
+
if ( isname != null )
{
sb.append( tabs ).append( " i-sname: " ).append( isname.toString() ).append( '\n' );
}
-
+
sb.append( tabs + " elements:" ).append( elements.toString( tabs + " " ) ).append( '\n' );
sb.append( tabs + "}\n" );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdMandatoryForKdc.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdMandatoryForKdc.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdMandatoryForKdc.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdMandatoryForKdc.java Tue Jan 24 16:15:05 2012
@@ -20,8 +20,6 @@
package org.apache.directory.shared.kerberos.components;
-
-
/**
* The AdIfRelevant structure is used to store a AD-MANDATORY-FOR-KDC associated to a type.
*
@@ -41,7 +39,7 @@ public class AdMandatoryForKdc extends A
super();
}
-
+
/**
* @see Object#toString()
*/
@@ -59,7 +57,7 @@ public class AdMandatoryForKdc extends A
StringBuilder sb = new StringBuilder();
sb.append( tabs ).append( "AD-MANDATORY-FOR-KDC : {\n" );
- sb.append( tabs ).append( super.toString( " " + tabs) ).append( '\n' );
+ sb.append( tabs ).append( super.toString( " " + tabs ) ).append( '\n' );
sb.append( tabs + "}\n" );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java Tue Jan 24 16:15:05 2012
@@ -54,7 +54,7 @@ public class AuthorizationData extends A
{
/** The list of AuthorizationData elements */
private List<AuthorizationDataEntry> authorizationData = new ArrayList<AuthorizationDataEntry>();
-
+
/** The current AD being processed */
private AuthorizationDataEntry currentAD;
@@ -77,8 +77,8 @@ public class AuthorizationData extends A
public AuthorizationData()
{
}
-
-
+
+
/**
* Compute the AuthorizationData length
* <pre>
@@ -103,21 +103,21 @@ public class AuthorizationData extends A
adTypeTagLen = new int[authorizationData.size()];
adDataTagLen = new int[authorizationData.size()];
authorizationDataSeqSeqLen = 0;
-
+
for ( AuthorizationDataEntry ad : authorizationData )
{
int adTypeLen = Value.getNbBytes( ad.getAdType().getValue() );
adTypeTagLen[i] = 1 + TLV.getNbBytes( adTypeLen ) + adTypeLen;
adDataTagLen[i] = 1 + TLV.getNbBytes( ad.getAdDataRef().length ) + ad.getAdDataRef().length;
-
- authorizationDataSeqLen[i] = 1 + TLV.getNbBytes( adTypeTagLen[i] ) + adTypeTagLen[i] +
- 1 + TLV.getNbBytes( adDataTagLen[i] ) + adDataTagLen[i];
-
+
+ authorizationDataSeqLen[i] = 1 + TLV.getNbBytes( adTypeTagLen[i] ) + adTypeTagLen[i] +
+ 1 + TLV.getNbBytes( adDataTagLen[i] ) + adDataTagLen[i];
+
authorizationDataSeqSeqLen += 1 + TLV.getNbBytes( authorizationDataSeqLen[i] ) + authorizationDataSeqLen[i];
i++;
}
- return 1 + TLV.getNbBytes(authorizationDataSeqSeqLen) + authorizationDataSeqSeqLen;
+ return 1 + TLV.getNbBytes( authorizationDataSeqSeqLen ) + authorizationDataSeqSeqLen;
}
@@ -141,24 +141,24 @@ public class AuthorizationData extends A
// The AuthorizationData SEQ OF Tag
buffer.put( UniversalTag.SEQUENCE.getValue() );
buffer.put( TLV.getBytes( authorizationDataSeqSeqLen ) );
-
+
int i = 0;
-
+
for ( AuthorizationDataEntry ad : authorizationData )
{
buffer.put( UniversalTag.SEQUENCE.getValue() );
buffer.put( TLV.getBytes( authorizationDataSeqLen[i] ) );
-
+
// the adType
buffer.put( ( byte ) KerberosConstants.AUTHORIZATION_DATA_ADTYPE_TAG );
buffer.put( TLV.getBytes( adTypeTagLen[i] ) );
Value.encode( buffer, ad.getAdType().getValue() );
-
+
// the adData
buffer.put( ( byte ) KerberosConstants.AUTHORIZATION_DATA_ADDATA_TAG );
buffer.put( TLV.getBytes( adDataTagLen[i] ) );
Value.encode( buffer, ad.getAdDataRef() );
-
+
i++;
}
}
@@ -171,7 +171,7 @@ public class AuthorizationData extends A
if ( IS_DEBUG )
{
- LOG.debug( "AuthorizationData encoding : {}", Strings.dumpBytes(buffer.array()) );
+ LOG.debug( "AuthorizationData encoding : {}", Strings.dumpBytes( buffer.array() ) );
LOG.debug( "AuthorizationData initial value : {}", toString() );
}
@@ -237,7 +237,7 @@ public class AuthorizationData extends A
/**
* Add a new AuthorizationDataEntry
*/
- public void addEntry( AuthorizationDataEntry entry)
+ public void addEntry( AuthorizationDataEntry entry )
{
authorizationData.add( entry );
}
@@ -276,9 +276,9 @@ public class AuthorizationData extends A
{
return false;
}
-
+
AuthorizationData other = ( AuthorizationData ) obj;
-
+
if ( authorizationData == null )
{
if ( other.authorizationData != null )
@@ -290,7 +290,7 @@ public class AuthorizationData extends A
{
return false;
}
-
+
if ( currentAD == null )
{
if ( other.currentAD != null )
@@ -302,7 +302,7 @@ public class AuthorizationData extends A
{
return false;
}
-
+
return true;
}
@@ -315,7 +315,7 @@ public class AuthorizationData extends A
StringBuilder sb = new StringBuilder();
sb.append( tabs ).append( "AuthorizationData : \n" );
-
+
for ( AuthorizationDataEntry ad : authorizationData )
{
sb.append( ad.toString( tabs + " " ) );
@@ -323,6 +323,8 @@ public class AuthorizationData extends A
return sb.toString();
}
+
+
/**
* @see Object#toString()
*/
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationDataEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationDataEntry.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationDataEntry.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationDataEntry.java Tue Jan 24 16:15:05 2012
@@ -19,12 +19,14 @@
*/
package org.apache.directory.shared.kerberos.components;
+
import java.util.Arrays;
import org.apache.directory.shared.kerberos.codec.types.AuthorizationType;
import org.apache.directory.shared.util.StringConstants;
import org.apache.directory.shared.util.Strings;
+
/**
* The class storing the individual AuthorizationDatas
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -36,16 +38,17 @@ public class AuthorizationDataEntry
/** the authorization data */
private byte[] adData;
-
+
+
/**
* Creates a new instance of AD entry
*/
public AuthorizationDataEntry()
{
-
+
}
-
-
+
+
/**
* Creates a new Instance of AD entry
*
@@ -55,7 +58,7 @@ public class AuthorizationDataEntry
public AuthorizationDataEntry( AuthorizationType adType, byte[] adData )
{
this.adType = adType;
-
+
if ( adData != null )
{
this.adData = new byte[adData.length];
@@ -63,7 +66,7 @@ public class AuthorizationDataEntry
}
}
-
+
/**
* @return the adType
*/
@@ -87,20 +90,20 @@ public class AuthorizationDataEntry
*/
public byte[] getAdData()
{
- if ( Strings.isEmpty(adData) )
+ if ( Strings.isEmpty( adData ) )
{
return StringConstants.EMPTY_BYTES;
}
else
{
byte[] copy = new byte[adData.length];
-
+
System.arraycopy( adData, 0, copy, 0, adData.length );
-
+
return copy;
}
}
-
+
/**
* @return the reference on adData
@@ -109,21 +112,21 @@ public class AuthorizationDataEntry
{
return adData;
}
-
+
/**
* @param adData the adData to set
*/
public void setAdData( byte[] adData )
{
- if ( Strings.isEmpty(adData) )
+ if ( Strings.isEmpty( adData ) )
{
this.adData = StringConstants.EMPTY_BYTES;
}
else
{
this.adData = new byte[adData.length];
-
+
System.arraycopy( adData, 0, this.adData, 0, adData.length );
}
}
@@ -142,6 +145,7 @@ public class AuthorizationDataEntry
return result;
}
+
/**
* {@inheritDoc}
*/
@@ -152,19 +156,19 @@ public class AuthorizationDataEntry
{
return true;
}
-
+
if ( obj == null )
{
return false;
}
-
+
AuthorizationDataEntry other = ( AuthorizationDataEntry ) obj;
-
+
if ( !Arrays.equals( adData, other.adData ) )
{
return false;
}
-
+
if ( adType != other.adType )
{
return false;
@@ -172,23 +176,23 @@ public class AuthorizationDataEntry
return true;
}
-
-
+
+
/**
* @see Object#toString()
*/
public String toString( String tabs )
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( tabs ).append( "AuthorizationDataEntry : {\n" );
sb.append( tabs ).append( " adType : " ).append( adType ).append( "\n" );
- sb.append( tabs ).append( " adData : " ).append( Strings.dumpBytes(adData) ).append( "\n" );
+ sb.append( tabs ).append( " adData : " ).append( Strings.dumpBytes( adData ) ).append( "\n" );
sb.append( tabs ).append( "}" );
return sb.toString();
}
-
-
+
+
/**
* @see Object#toString()
*/
@@ -197,4 +201,3 @@ public class AuthorizationDataEntry
return toString( "" );
}
}
-
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java Tue Jan 24 16:15:05 2012
@@ -76,7 +76,7 @@ public class Checksum extends AbstractAs
{
}
-
+
/**
* Creates a new instance of Checksum.
*
@@ -99,7 +99,7 @@ public class Checksum extends AbstractAs
int hash = 37;
hash = hash * 17 + cksumtype.hashCode();
hash = hash * 17 + Arrays.hashCode( checksum );
-
+
return hash;
}
@@ -266,14 +266,14 @@ public class Checksum extends AbstractAs
if ( IS_DEBUG )
{
- log.debug( "Checksum encoding : {}", Strings.dumpBytes(buffer.array()) );
+ log.debug( "Checksum encoding : {}", Strings.dumpBytes( buffer.array() ) );
log.debug( "Checksum initial value : {}", toString() );
}
return buffer;
}
-
+
/**
* @see Object#toString()
*/
@@ -291,11 +291,11 @@ public class Checksum extends AbstractAs
StringBuilder sb = new StringBuilder();
sb.append( tabs ).append( "Checksum : {\n" );
- sb.append( tabs ).append( " cksumtype: " ).append( cksumtype ).append( '\n' );
+ sb.append( tabs ).append( " cksumtype: " ).append( cksumtype ).append( '\n' );
if ( checksum != null )
{
- sb.append( tabs + " checksum:" ).append( Strings.dumpBytes(checksum) ).append( '\n' );
+ sb.append( tabs + " checksum:" ).append( Strings.dumpBytes( checksum ) ).append( '\n' );
}
sb.append( tabs + "}\n" );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java Tue Jan 24 16:15:05 2012
@@ -67,7 +67,7 @@ public class ETypeInfo extends AbstractA
{
this.etypeInfoEntries = new ArrayList<ETypeInfoEntry>();
}
-
+
/**
* Creates a new instance of ETypeInfo.
@@ -121,17 +121,17 @@ public class ETypeInfo extends AbstractA
public int hashCode()
{
int hash = 37;
-
+
if ( etypeInfoEntries != null )
{
hash = hash * 17 + etypeInfoEntries.size();
-
+
for ( ETypeInfoEntry etypeInfoEntry : etypeInfoEntries )
{
hash = hash * 17 + etypeInfoEntry.hashCode();
}
}
-
+
return hash;
}
@@ -144,11 +144,11 @@ public class ETypeInfo extends AbstractA
*/
public boolean equals( ETypeInfo that )
{
- if ( that == null )
+ if ( that == null )
{
return false;
}
-
+
// infoEntries can't be null after creation
if ( etypeInfoEntries.size() != that.etypeInfoEntries.size() )
{
@@ -260,7 +260,7 @@ public class ETypeInfo extends AbstractA
if ( IS_DEBUG )
{
- LOG.debug( "ETYPE-INFO encoding : {}", Strings.dumpBytes(buffer.array()) );
+ LOG.debug( "ETYPE-INFO encoding : {}", Strings.dumpBytes( buffer.array() ) );
LOG.debug( "ETYPE-INFO initial value : {}", toString() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java Tue Jan 24 16:15:05 2012
@@ -67,7 +67,7 @@ public class ETypeInfo2 extends Abstract
{
this.etypeInfo2Entries = new ArrayList<ETypeInfo2Entry>();
}
-
+
/**
* Creates a new instance of ETypeInfo2.
@@ -121,17 +121,17 @@ public class ETypeInfo2 extends Abstract
public int hashCode()
{
int hash = 37;
-
+
if ( etypeInfo2Entries != null )
{
hash = hash * 17 + etypeInfo2Entries.size();
-
+
for ( ETypeInfo2Entry etypeInfo2Entry : etypeInfo2Entries )
{
hash = hash * 17 + etypeInfo2Entry.hashCode();
}
}
-
+
return hash;
}
@@ -144,11 +144,11 @@ public class ETypeInfo2 extends Abstract
*/
public boolean equals( ETypeInfo2 that )
{
- if ( that == null )
+ if ( that == null )
{
return false;
}
-
+
// infoEntries can't be null after creation
if ( etypeInfo2Entries.size() != that.etypeInfo2Entries.size() )
{
@@ -260,7 +260,7 @@ public class ETypeInfo2 extends Abstract
if ( IS_DEBUG )
{
- LOG.debug( "ETYPE-INFO encoding : {}", Strings.dumpBytes(buffer.array()) );
+ LOG.debug( "ETYPE-INFO encoding : {}", Strings.dumpBytes( buffer.array() ) );
LOG.debug( "ETYPE-INFO initial value : {}", toString() );
}