Author: erodriguez
Date: Sun Oct 17 06:17:38 2004
New Revision: 54960
Modified:
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/ChecksumEngine.java
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/Crc32Checksum.java
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/RsaMd4Checksum.java
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/RsaMd5Checksum.java
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/Sha1Checksum.java
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/DesCbcEncryption.java
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/EncryptionEngine.java
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/NullEncryption.java
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/messages/value/EncryptionKey.java
Log:
Clarification of cipher types, in preparation for addition of DES3-based
encryption types.
Modified:
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/ChecksumEngine.java
==============================================================================
---
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/ChecksumEngine.java
(original)
+++
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/ChecksumEngine.java
Sun Oct 17 06:17:38 2004
@@ -16,10 +16,12 @@
*/
package org.apache.kerberos.crypto.checksum;
+import org.apache.kerberos.crypto.encryption.*;
+
public interface ChecksumEngine {
public ChecksumType checksumType();
- public int keyType();
+ public CipherType keyType();
public int checksumSize();
public int keySize();
public int confounderSize();
Modified:
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/Crc32Checksum.java
==============================================================================
---
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/Crc32Checksum.java
(original)
+++
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/Crc32Checksum.java
Sun Oct 17 06:17:38 2004
@@ -16,7 +16,7 @@
*/
package org.apache.kerberos.crypto.checksum;
-import org.apache.kerberos.messages.value.*;
+import org.apache.kerberos.crypto.encryption.*;
import org.apache.kerberos.util.*;
import java.util.zip.*;
@@ -29,8 +29,8 @@
return ChecksumType.CRC32;
}
- public int keyType() {
- return EncryptionKey.KEYTYPE_NULL;
+ public CipherType keyType() {
+ return CipherType.NULL;
}
public int checksumSize() {
Modified:
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/RsaMd4Checksum.java
==============================================================================
---
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/RsaMd4Checksum.java
(original)
+++
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/RsaMd4Checksum.java
Sun Oct 17 06:17:38 2004
@@ -16,7 +16,7 @@
*/
package org.apache.kerberos.crypto.checksum;
-import org.apache.kerberos.messages.value.*;
+import org.apache.kerberos.crypto.encryption.*;
import org.bouncycastle.crypto.*;
import org.bouncycastle.crypto.digests.*;
@@ -28,8 +28,8 @@
return ChecksumType.RSA_MD4;
}
- public int keyType() {
- return EncryptionKey.KEYTYPE_NULL;
+ public CipherType keyType() {
+ return CipherType.NULL;
}
public int checksumSize() {
Modified:
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/RsaMd5Checksum.java
==============================================================================
---
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/RsaMd5Checksum.java
(original)
+++
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/RsaMd5Checksum.java
Sun Oct 17 06:17:38 2004
@@ -16,7 +16,7 @@
*/
package org.apache.kerberos.crypto.checksum;
-import org.apache.kerberos.messages.value.*;
+import org.apache.kerberos.crypto.encryption.*;
import org.bouncycastle.crypto.*;
import org.bouncycastle.crypto.digests.*;
@@ -28,8 +28,8 @@
return ChecksumType.RSA_MD5;
}
- public int keyType() {
- return EncryptionKey.KEYTYPE_NULL;
+ public CipherType keyType() {
+ return CipherType.NULL;
}
public int checksumSize() {
Modified:
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/Sha1Checksum.java
==============================================================================
---
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/Sha1Checksum.java
(original)
+++
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/checksum/Sha1Checksum.java
Sun Oct 17 06:17:38 2004
@@ -16,7 +16,7 @@
*/
package org.apache.kerberos.crypto.checksum;
-import org.apache.kerberos.messages.value.*;
+import org.apache.kerberos.crypto.encryption.*;
import org.bouncycastle.crypto.*;
import org.bouncycastle.crypto.digests.*;
@@ -28,8 +28,8 @@
return ChecksumType.SHA1;
}
- public int keyType() {
- return EncryptionKey.KEYTYPE_NULL;
+ public CipherType keyType() {
+ return CipherType.NULL;
}
public int checksumSize() {
Modified:
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/DesCbcEncryption.java
==============================================================================
---
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/DesCbcEncryption.java
(original)
+++
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/DesCbcEncryption.java
Sun Oct 17 06:17:38 2004
@@ -16,15 +16,14 @@
*/
package org.apache.kerberos.crypto.encryption;
-import org.apache.kerberos.messages.value.*;
import org.bouncycastle.crypto.engines.*;
import org.bouncycastle.crypto.modes.*;
import org.bouncycastle.crypto.params.*;
public abstract class DesCbcEncryption extends EncryptionEngine {
- public int keyType() {
- return EncryptionKey.KEYTYPE_DES;
+ public CipherType keyType() {
+ return CipherType.DES;
}
public int blockSize() {
Modified:
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/EncryptionEngine.java
==============================================================================
---
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/EncryptionEngine.java
(original)
+++
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/EncryptionEngine.java
Sun Oct 17 06:17:38 2004
@@ -26,7 +26,7 @@
public abstract ChecksumType checksumType();
- public abstract int keyType();
+ public abstract CipherType keyType();
public abstract int confounderSize();
Modified:
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/NullEncryption.java
==============================================================================
---
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/NullEncryption.java
(original)
+++
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/crypto/encryption/NullEncryption.java
Sun Oct 17 06:17:38 2004
@@ -17,7 +17,6 @@
package org.apache.kerberos.crypto.encryption;
import org.apache.kerberos.crypto.checksum.*;
-import org.apache.kerberos.messages.value.*;
public class NullEncryption extends EncryptionEngine {
@@ -25,8 +24,8 @@
return EncryptionType.NULL;
}
- public int keyType() {
- return EncryptionKey.KEYTYPE_NULL;
+ public CipherType keyType() {
+ return CipherType.NULL;
}
public ChecksumType checksumType() {
Modified:
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/messages/value/EncryptionKey.java
==============================================================================
---
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/messages/value/EncryptionKey.java
(original)
+++
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/messages/value/EncryptionKey.java
Sun Oct 17 06:17:38 2004
@@ -19,8 +19,6 @@
import org.apache.kerberos.crypto.encryption.*;
public class EncryptionKey {
- public static final int KEYTYPE_NULL = 0;
- public static final int KEYTYPE_DES = 1;
private EncryptionType _keyType;
private byte[] _keyValue;
