Author: erodriguez
Date: Sun Oct 31 21:10:54 2004
New Revision: 56207
Modified:
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/EncryptionType.java
Log:
Modified EncryptionType types to be more easily matched to configuration
properties.
Modified:
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/EncryptionType.java
==============================================================================
---
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/EncryptionType.java
(original)
+++
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/EncryptionType.java
Sun Oct 31 21:10:54 2004
@@ -25,26 +25,26 @@
* Order of appearance here determines the order of compareTo.
*/
public static final EncryptionType NULL = new
EncryptionType(0, "null");
- public static final EncryptionType DES_CBC_CRC = new
EncryptionType(1, "DES CBC CRC");
- public static final EncryptionType DES_CBC_MD4 = new
EncryptionType(2, "DES CBC MD4");
- public static final EncryptionType DES_CBC_MD5 = new
EncryptionType(3, "DES CBC MD5");
- public static final EncryptionType RESERVED4 = new
EncryptionType(4, "RESERVED - 4");
- public static final EncryptionType DES3_CBC_MD5 = new
EncryptionType(5, "DES3 CBC MD5");
- public static final EncryptionType RESERVED6 = new
EncryptionType(6, "RESERVED - 6");
- public static final EncryptionType DES3_CBC_SHA1 = new
EncryptionType(7, "DES3 CBC SHA1");
- public static final EncryptionType DES3_CBC_SHA1_KD = new
EncryptionType(8, "DES3 CBC SHA1 KD");
- public static final EncryptionType DSAWITHSHA1_CMSOID = new
EncryptionType(9, "DSA with SHA1 CMS oid");
- public static final EncryptionType MD5WITHRSAENCRYPTION_CMSOID = new
EncryptionType(10, "MD5 with RSA encryption CMS oid");
- public static final EncryptionType SHA1WITHRSAENCRYPTION_CMSOID = new
EncryptionType(11, "SHA1 with RSA encryption CMS oid");
- public static final EncryptionType RC2CBC_ENVOID = new
EncryptionType(12, "RC2 CBC environment oid");
- public static final EncryptionType RSAENCRYPTION_ENVOID = new
EncryptionType(13, "RSA encryption environment oid");
- public static final EncryptionType RSAES_OAEP_ENV_OID = new
EncryptionType(14, "RSA ES OAEP environment oid");
- public static final EncryptionType DES_EDE3_CBC_ENV_OID = new
EncryptionType(15, "DES EDE3 CBC environment oid");
- public static final EncryptionType RC4_HMAC = new
EncryptionType(16, "RC4 HMAC");
- public static final EncryptionType PK_CROSS = new
EncryptionType(17, "PK cross");
+ public static final EncryptionType DES_CBC_CRC = new
EncryptionType(1, "DES-CBC-CRC");
+ public static final EncryptionType DES_CBC_MD4 = new
EncryptionType(2, "DES-CBC-MD4");
+ public static final EncryptionType DES_CBC_MD5 = new
EncryptionType(3, "DES-CBC-MD5");
+ public static final EncryptionType RESERVED4 = new
EncryptionType(4, "RESERVED-4");
+ public static final EncryptionType DES3_CBC_MD5 = new
EncryptionType(5, "DES3-CBC-MD5");
+ public static final EncryptionType RESERVED6 = new
EncryptionType(6, "RESERVED-6");
+ public static final EncryptionType DES3_CBC_SHA1 = new
EncryptionType(7, "DES3-CBC-SHA1");
+ public static final EncryptionType DES3_CBC_SHA1_KD = new
EncryptionType(8, "DES3-CBC-SHA1-KD");
+ public static final EncryptionType DSAWITHSHA1_CMSOID = new
EncryptionType(9, "DSA-with-SHA1-CMS-oid");
+ public static final EncryptionType MD5WITHRSAENCRYPTION_CMSOID = new
EncryptionType(10, "MD5-with-RSA-encryption-CMS-oid");
+ public static final EncryptionType SHA1WITHRSAENCRYPTION_CMSOID = new
EncryptionType(11, "SHA1-with-RSA-encryption-CMS-oid");
+ public static final EncryptionType RC2CBC_ENVOID = new
EncryptionType(12, "RC2-CBC-environment-oid");
+ public static final EncryptionType RSAENCRYPTION_ENVOID = new
EncryptionType(13, "RSA-encryption-environment-oid");
+ public static final EncryptionType RSAES_OAEP_ENV_OID = new
EncryptionType(14, "RSA-ES-OAEP-environment-oid");
+ public static final EncryptionType DES_EDE3_CBC_ENV_OID = new
EncryptionType(15, "DES-EDE3-CBC-environment-oid");
+ public static final EncryptionType RC4_HMAC = new
EncryptionType(16, "RC4-HMAC");
+ public static final EncryptionType PK_CROSS = new
EncryptionType(17, "PK-cross");
public String toString() {
- return _fName + " (" + _fOrdinal + ")";
+ return _fName;
}
public int compareTo(Object that) {
