Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 72133 invoked from network); 1 May 2007 04:49:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 May 2007 04:49:04 -0000 Received: (qmail 84689 invoked by uid 500); 1 May 2007 04:49:10 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 84639 invoked by uid 500); 1 May 2007 04:49:10 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 84627 invoked by uid 99); 1 May 2007 04:49:10 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Apr 2007 21:49:10 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Apr 2007 21:49:03 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4FB671A9838; Mon, 30 Apr 2007 21:48:43 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r533939 - /directory/apacheds/branches/kerberos-encryption-types/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NullEncryption.java Date: Tue, 01 May 2007 04:48:43 -0000 To: commits@directory.apache.org From: erodriguez@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070501044843.4FB671A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: erodriguez Date: Mon Apr 30 21:48:42 2007 New Revision: 533939 URL: http://svn.apache.org/viewvc?view=rev&rev=533939 Log: Updated NULL encryption type to match enhanced base class. Modified: directory/apacheds/branches/kerberos-encryption-types/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NullEncryption.java Modified: directory/apacheds/branches/kerberos-encryption-types/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NullEncryption.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/kerberos-encryption-types/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NullEncryption.java?view=diff&rev=533939&r1=533938&r2=533939 ============================================================================== --- directory/apacheds/branches/kerberos-encryption-types/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NullEncryption.java (original) +++ directory/apacheds/branches/kerberos-encryption-types/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NullEncryption.java Mon Apr 30 21:48:42 2007 @@ -20,10 +20,9 @@ package org.apache.directory.server.kerberos.shared.crypto.encryption; -import javax.crypto.Cipher; - -import org.apache.directory.server.kerberos.shared.crypto.checksum.ChecksumEngine; -import org.apache.directory.server.kerberos.shared.crypto.checksum.ChecksumType; +import org.apache.directory.server.kerberos.shared.exceptions.KerberosException; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptedData; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey; /** @@ -32,74 +31,56 @@ */ public class NullEncryption extends EncryptionEngine { - public Cipher getCipher() - { - return null; - } - - - public ChecksumEngine getChecksumEngine() - { - return null; - } - - - public EncryptionType encryptionType() + public EncryptionType getEncryptionType() { return EncryptionType.NULL; } - public CipherType keyType() + public int getChecksumLength() { - return CipherType.NULL; + return 0; } - public ChecksumType checksumType() + public int getConfounderLength() { - return ChecksumType.NULL; + return 0; } - public int blockSize() + public byte[] getDecryptedData( EncryptionKey key, EncryptedData data ) throws KerberosException { - return 1; + return data.getCipherText(); } - public int keySize() + public EncryptedData getEncryptedData( EncryptionKey key, byte[] plainText ) { - return 0; + return new EncryptedData( getEncryptionType(), key.getKeyVersion(), plainText ); } - public int checksumSize() + public byte[] encrypt( byte[] plainText, byte[] keyBytes ) { - return 0; + return processCipher( true, plainText, keyBytes ); } - public int confounderSize() + public byte[] decrypt( byte[] cipherText, byte[] keyBytes ) { - return 0; + return processCipher( false, cipherText, keyBytes ); } - public int minimumPadSize() + public byte[] calculateChecksum( byte[] plainText, byte[] key ) { - return 0; + return null; } - protected byte[] processCipher( boolean encrypt, byte[] data, byte[] key, byte[] ivec ) + private byte[] processCipher( boolean encrypt, byte[] data, byte[] key ) { return data; - } - - - public byte[] calculateChecksum( byte[] plainText ) - { - return null; } }