You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2007/05/25 09:16:07 UTC
svn commit: r541572 - in
/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto:
checksum/ encryption/
Author: erodriguez
Date: Fri May 25 00:16:04 2007
New Revision: 541572
URL: http://svn.apache.org/viewvc?view=rev&rev=541572
Log:
Removing unused code:
o Removed class CipherType.
o Removed references to CipherType.
Removed:
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherType.java
Modified:
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumEngine.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/Crc32Checksum.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacMd5Checksum.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacSha196Aes128Checksum.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacSha196Aes256Checksum.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacSha1Des3KdChecksum.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/RsaMd5Checksum.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/AesCtsSha1Encryption.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Des3CbcSha1KdEncryption.java
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumEngine.java?view=diff&rev=541572&r1=541571&r2=541572
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumEngine.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumEngine.java Fri May 25 00:16:04 2007
@@ -20,7 +20,6 @@
package org.apache.directory.server.kerberos.shared.crypto.checksum;
-import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherType;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
@@ -36,14 +35,6 @@
* @return The checksum type.
*/
public ChecksumType checksumType();
-
-
- /**
- * Returns the key type of this checksum engine.
- *
- * @return The key type.
- */
- public CipherType keyType();
/**
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/Crc32Checksum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/Crc32Checksum.java?view=diff&rev=541572&r1=541571&r2=541572
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/Crc32Checksum.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/Crc32Checksum.java Fri May 25 00:16:04 2007
@@ -23,7 +23,6 @@
import java.util.zip.CRC32;
-import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherType;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
@@ -36,12 +35,6 @@
public ChecksumType checksumType()
{
return ChecksumType.CRC32;
- }
-
-
- public CipherType keyType()
- {
- return CipherType.NULL;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacMd5Checksum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacMd5Checksum.java?view=diff&rev=541572&r1=541571&r2=541572
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacMd5Checksum.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacMd5Checksum.java Fri May 25 00:16:04 2007
@@ -26,7 +26,6 @@
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherType;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
@@ -39,12 +38,6 @@
public ChecksumType checksumType()
{
return ChecksumType.HMAC_MD5;
- }
-
-
- public CipherType keyType()
- {
- return CipherType.ARCFOUR;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacSha196Aes128Checksum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacSha196Aes128Checksum.java?view=diff&rev=541572&r1=541571&r2=541572
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacSha196Aes128Checksum.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacSha196Aes128Checksum.java Fri May 25 00:16:04 2007
@@ -26,7 +26,6 @@
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherType;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
@@ -39,12 +38,6 @@
public ChecksumType checksumType()
{
return ChecksumType.HMAC_SHA1_96_AES128;
- }
-
-
- public CipherType keyType()
- {
- return CipherType.AES;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacSha196Aes256Checksum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacSha196Aes256Checksum.java?view=diff&rev=541572&r1=541571&r2=541572
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacSha196Aes256Checksum.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacSha196Aes256Checksum.java Fri May 25 00:16:04 2007
@@ -26,7 +26,6 @@
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherType;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
@@ -39,12 +38,6 @@
public ChecksumType checksumType()
{
return ChecksumType.HMAC_SHA1_96_AES256;
- }
-
-
- public CipherType keyType()
- {
- return CipherType.AES;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacSha1Des3KdChecksum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacSha1Des3KdChecksum.java?view=diff&rev=541572&r1=541571&r2=541572
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacSha1Des3KdChecksum.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/HmacSha1Des3KdChecksum.java Fri May 25 00:16:04 2007
@@ -26,7 +26,6 @@
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherType;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
@@ -39,12 +38,6 @@
public ChecksumType checksumType()
{
return ChecksumType.HMAC_SHA1_DES3_KD;
- }
-
-
- public CipherType keyType()
- {
- return CipherType.DES3;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/RsaMd5Checksum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/RsaMd5Checksum.java?view=diff&rev=541572&r1=541571&r2=541572
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/RsaMd5Checksum.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/RsaMd5Checksum.java Fri May 25 00:16:04 2007
@@ -23,7 +23,6 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherType;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
@@ -36,12 +35,6 @@
public ChecksumType checksumType()
{
return ChecksumType.RSA_MD5;
- }
-
-
- public CipherType keyType()
- {
- return CipherType.NULL;
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/AesCtsSha1Encryption.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/AesCtsSha1Encryption.java?view=diff&rev=541572&r1=541571&r2=541572
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/AesCtsSha1Encryption.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/AesCtsSha1Encryption.java Fri May 25 00:16:04 2007
@@ -61,12 +61,6 @@
}
- public CipherType keyType()
- {
- return CipherType.AES;
- }
-
-
protected abstract int getKeyLength();
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Des3CbcSha1KdEncryption.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Des3CbcSha1KdEncryption.java?view=diff&rev=541572&r1=541571&r2=541572
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Des3CbcSha1KdEncryption.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Des3CbcSha1KdEncryption.java Fri May 25 00:16:04 2007
@@ -73,12 +73,6 @@
}
- public CipherType keyType()
- {
- return CipherType.DES3;
- }
-
-
public byte[] calculateChecksum( byte[] data, byte[] key, KeyUsage usage )
{
byte[] Kc = deriveKey( key, getUsageKc( usage ), 64, 168 );