hello all,
the attached patch --already committed-- cleans up some classes in
gnu.javax.crypto to remove warnings detected by Eclipse.
2006-06-04 Raif S. Naffah <[EMAIL PROTECTED]>
* gnu/javax/crypto/sasl/SaslUtil.java: Remove unused import.
* gnu/javax/crypto/sasl/srp/SRPRegistry.java (PASSWORD_DB): Fix javadoc
@link.
* gnu/javax/crypto/sasl/srp/PasswordFile.java: Removed unused import.
* gnu/javax/crypto/prng/CSPRNG.java (FILE_SOURCES): Fix javadoc @see.
(getSystemInstance): Fix javadoc @link.
(counter): Increased visibility.
* gnu/javax/crypto/pad/TLS1.java: Remove unused import.
* gnu/javax/crypto/pad/IPad.java: Fix javadoc @link.
* gnu/javax/crypto/pad/PKCS1_V1_5.java (PKCS1_V1_5): Likewise.
* gnu/javax/crypto/pad/PKCS7.java (PKCS7): Likewise.
* gnu/javax/crypto/pad/TBC.java (TBC): Likewise.
* gnu/javax/crypto/mode/CTR.java: Remove unused import.
* gnu/javax/crypto/mode/BaseMode.java (defaultBlockSize): Fix javadoc
@see.
* gnu/javax/crypto/key/dh/GnuDHPrivateKey.java (getEncoded): Fix
javadoc @see.
* gnu/javax/crypto/jce/spec/TMMHParameterSpec.java: Fix javadoc @link.
* gnu/javax/crypto/keyring/AuthenticatedEntry.java: Remove unused
imports.
* gnu/javax/crypto/keyring/CertificateEntry.java: Likewise.
* gnu/javax/crypto/keyring/CertPathEntry.java: Likewise.
* gnu/javax/crypto/keyring/EncryptedEntry.java: Likewise.
* gnu/javax/crypto/keyring/PublicKeyEntry.java: Likewise.
* gnu/javax/crypto/mac/OMAC.java: Likewise.
* gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java: Likewise.
* gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java: Likewise.
* gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java: Likewise.
* gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java: Likewise.
* gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java: Likewise.
* gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java: Likewise.
* gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java: Likewise.
* gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java: Likewise.
* gnu/javax/crypto/jce/mac/OMacImpl.java: Likewise.
* gnu/javax/crypto/jce/prng/CSPRNGSpi.java: Likewise.
* gnu/javax/crypto/cipher/IBlockCipherSpi.java: Fix javadoc @link.
* gnu/javax/crypto/jce/cipher/CipherAdapter.java (CipherAdapter):
Likewise.
* gnu/javax/crypto/cipher/BaseCipher.java: Remove unused import.
* gnu/javax/crypto/assembly/Cascade.java: Fix javadoc @link.
* gnu/javax/crypto/assembly/Direction.java: Likewise.
* gnu/javax/crypto/assembly/Transformer.java: Likewise.
cheers;
rsn
Index: Cascade.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/assembly/Cascade.java,v
retrieving revision 1.2
diff -u -r1.2 Cascade.java
--- Cascade.java 13 Apr 2006 21:07:02 -0000 1.2
+++ Cascade.java 4 Jun 2006 06:18:30 -0000
@@ -60,7 +60,7 @@
* of identical ciphers).</p>
*
* <p>The term "block ciphers" used above refers to implementations of
- * [EMAIL PROTECTED] gnu.crypto.mode.IMode}, including the [EMAIL PROTECTED] gnu.crypto.mode.ECB}
+ * [EMAIL PROTECTED] gnu.javax.crypto.mode.IMode}, including the [EMAIL PROTECTED] gnu.javax.crypto.mode.ECB}
* mode which basically exposes a symmetric-key block cipher algorithm as a
* <i>Mode</i> of Operations.</p>
*
Index: Direction.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/assembly/Direction.java,v
retrieving revision 1.2
diff -u -r1.2 Direction.java
--- Direction.java 13 Apr 2006 21:07:02 -0000 1.2
+++ Direction.java 4 Jun 2006 06:18:58 -0000
@@ -45,9 +45,9 @@
*
* <p>The possible values for this type are two:</p>
* <ol>
- * <li>FORWARD: equivalent to [EMAIL PROTECTED] gnu.crypto.mode.IMode#ENCRYPTION}, and
+ * <li>FORWARD: equivalent to [EMAIL PROTECTED] gnu.javax.crypto.mode.IMode#ENCRYPTION}, and
* its inverse value</li>
- * <li>REVERSED: equivalent to [EMAIL PROTECTED] gnu.crypto.mode.IMode#DECRYPTION}.</li>
+ * <li>REVERSED: equivalent to [EMAIL PROTECTED] gnu.javax.crypto.mode.IMode#DECRYPTION}.</li>
* </ol>
*/
public final class Direction
Index: Transformer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/assembly/Transformer.java,v
retrieving revision 1.2
diff -u -r1.2 Transformer.java
--- Transformer.java 13 Apr 2006 21:07:02 -0000 1.2
+++ Transformer.java 4 Jun 2006 06:20:50 -0000
@@ -47,7 +47,7 @@
* <p>A <code>Transformer</code> is an abstract representation of a two-way
* <i>transformation</i> that can be chained together with other instances of
* this type. Examples of such transformations in this library are:
- * [EMAIL PROTECTED] Cascade} cipher, [EMAIL PROTECTED] gnu.crypto.pad.IPad} algorithm, and a
+ * [EMAIL PROTECTED] Cascade} cipher, [EMAIL PROTECTED] gnu.javax.crypto.pad.IPad} algorithm, and a
* ZLib-based deflater/inflater algorithm. A special implementation of a
* <code>Transformer</code> to close a chain is also provided.</p>
*
Index: BaseCipher.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/BaseCipher.java,v
retrieving revision 1.1
diff -u -r1.1 BaseCipher.java
--- BaseCipher.java 26 Jan 2006 02:25:08 -0000 1.1
+++ BaseCipher.java 4 Jun 2006 06:21:40 -0000
@@ -38,8 +38,6 @@
package gnu.javax.crypto.cipher;
-import gnu.java.security.util.Util;
-
import java.security.InvalidKeyException;
import java.util.Arrays;
import java.util.Iterator;
Index: IBlockCipherSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/IBlockCipherSpi.java,v
retrieving revision 1.1
diff -u -r1.1 IBlockCipherSpi.java
--- IBlockCipherSpi.java 26 Jan 2006 02:25:08 -0000 1.1
+++ IBlockCipherSpi.java 4 Jun 2006 06:22:24 -0000
@@ -43,7 +43,7 @@
/**
* <p>Package-private interface exposing mandatory methods to be implemented by
- * concrete [EMAIL PROTECTED] gnu.crypto.cipher.BaseCipher} sub-classes.</p>
+ * concrete [EMAIL PROTECTED] gnu.javax.crypto.cipher.BaseCipher} sub-classes.</p>
*/
interface IBlockCipherSpi extends Cloneable
{
Index: CipherAdapter.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java,v
retrieving revision 1.2
diff -u -r1.2 CipherAdapter.java
--- CipherAdapter.java 13 Apr 2006 21:07:02 -0000 1.2
+++ CipherAdapter.java 4 Jun 2006 06:23:22 -0000
@@ -118,9 +118,9 @@
/**
* <p>Protected constructor to be called by subclasses. The cipher name
- * argument should be the appropriate one listed in [EMAIL PROTECTED] gnu.crypto.Registry}.
+ * argument should be the appropriate one listed in [EMAIL PROTECTED] gnu.java.security.Registry}.
* The basic cipher instance is created, along with an instance of the
- * [EMAIL PROTECTED] gnu.crypto.mode.ECB} mode and no padding.</p>
+ * [EMAIL PROTECTED] gnu.javax.crypto.mode.ECB} mode and no padding.</p>
*
* @param cipherName The cipher to instantiate.
* @param blockLen The block length to use.
Index: AnubisSecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java,v
retrieving revision 1.1
diff -u -r1.1 AnubisSecretKeyFactoryImpl.java
--- AnubisSecretKeyFactoryImpl.java 26 Jan 2006 02:25:08 -0000 1.1
+++ AnubisSecretKeyFactoryImpl.java 4 Jun 2006 06:24:23 -0000
@@ -38,13 +38,6 @@
package gnu.javax.crypto.jce.key;
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
public class AnubisSecretKeyFactoryImpl extends SecretKeyFactoryImpl
{
public AnubisSecretKeyFactoryImpl()
Index: BlowfishSecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java,v
retrieving revision 1.1
diff -u -r1.1 BlowfishSecretKeyFactoryImpl.java
--- BlowfishSecretKeyFactoryImpl.java 26 Jan 2006 02:25:08 -0000 1.1
+++ BlowfishSecretKeyFactoryImpl.java 4 Jun 2006 06:25:04 -0000
@@ -38,13 +38,6 @@
package gnu.javax.crypto.jce.key;
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
public class BlowfishSecretKeyFactoryImpl extends SecretKeyFactoryImpl
{
public BlowfishSecretKeyFactoryImpl()
Index: Cast5SecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java,v
retrieving revision 1.1
diff -u -r1.1 Cast5SecretKeyFactoryImpl.java
--- Cast5SecretKeyFactoryImpl.java 26 Jan 2006 02:25:08 -0000 1.1
+++ Cast5SecretKeyFactoryImpl.java 4 Jun 2006 06:25:44 -0000
@@ -38,13 +38,6 @@
package gnu.javax.crypto.jce.key;
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
public class Cast5SecretKeyFactoryImpl extends SecretKeyFactoryImpl
{
public Cast5SecretKeyFactoryImpl()
Index: KhazadSecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java,v
retrieving revision 1.1
diff -u -r1.1 KhazadSecretKeyFactoryImpl.java
--- KhazadSecretKeyFactoryImpl.java 26 Jan 2006 02:25:08 -0000 1.1
+++ KhazadSecretKeyFactoryImpl.java 4 Jun 2006 06:26:26 -0000
@@ -37,13 +37,6 @@
package gnu.javax.crypto.jce.key;
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
public class KhazadSecretKeyFactoryImpl extends SecretKeyFactoryImpl
{
public KhazadSecretKeyFactoryImpl()
Index: RijndaelSecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java,v
retrieving revision 1.1
diff -u -r1.1 RijndaelSecretKeyFactoryImpl.java
--- RijndaelSecretKeyFactoryImpl.java 26 Jan 2006 02:25:08 -0000 1.1
+++ RijndaelSecretKeyFactoryImpl.java 4 Jun 2006 06:27:01 -0000
@@ -37,13 +37,6 @@
package gnu.javax.crypto.jce.key;
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
public class RijndaelSecretKeyFactoryImpl extends SecretKeyFactoryImpl
{
public RijndaelSecretKeyFactoryImpl()
Index: SerpentSecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java,v
retrieving revision 1.1
diff -u -r1.1 SerpentSecretKeyFactoryImpl.java
--- SerpentSecretKeyFactoryImpl.java 26 Jan 2006 02:25:08 -0000 1.1
+++ SerpentSecretKeyFactoryImpl.java 4 Jun 2006 06:27:35 -0000
@@ -37,13 +37,6 @@
package gnu.javax.crypto.jce.key;
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
public class SerpentSecretKeyFactoryImpl extends SecretKeyFactoryImpl
{
public SerpentSecretKeyFactoryImpl()
Index: SquareSecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java,v
retrieving revision 1.1
diff -u -r1.1 SquareSecretKeyFactoryImpl.java
--- SquareSecretKeyFactoryImpl.java 26 Jan 2006 02:25:08 -0000 1.1
+++ SquareSecretKeyFactoryImpl.java 4 Jun 2006 06:28:15 -0000
@@ -37,13 +37,6 @@
package gnu.javax.crypto.jce.key;
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
public class SquareSecretKeyFactoryImpl extends SecretKeyFactoryImpl
{
public SquareSecretKeyFactoryImpl()
Index: TwofishSecretKeyFactoryImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java,v
retrieving revision 1.1
diff -u -r1.1 TwofishSecretKeyFactoryImpl.java
--- TwofishSecretKeyFactoryImpl.java 26 Jan 2006 02:25:08 -0000 1.1
+++ TwofishSecretKeyFactoryImpl.java 4 Jun 2006 06:28:51 -0000
@@ -37,13 +37,6 @@
package gnu.javax.crypto.jce.key;
-import java.security.InvalidKeyException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactorySpi;
-import javax.crypto.spec.SecretKeySpec;
-
public class TwofishSecretKeyFactoryImpl extends SecretKeyFactoryImpl
{
public TwofishSecretKeyFactoryImpl()
Index: OMacImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/mac/OMacImpl.java,v
retrieving revision 1.1
diff -u -r1.1 OMacImpl.java
--- OMacImpl.java 26 Jan 2006 02:25:09 -0000 1.1
+++ OMacImpl.java 4 Jun 2006 06:29:42 -0000
@@ -39,7 +39,6 @@
package gnu.javax.crypto.jce.mac;
import gnu.java.security.Registry;
-import javax.crypto.MacSpi;
public abstract class OMacImpl extends MacAdapter
{
Index: CSPRNGSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/prng/CSPRNGSpi.java,v
retrieving revision 1.1
diff -u -r1.1 CSPRNGSpi.java
--- CSPRNGSpi.java 26 Jan 2006 02:25:09 -0000 1.1
+++ CSPRNGSpi.java 4 Jun 2006 06:33:31 -0000
@@ -38,10 +38,9 @@
package gnu.javax.crypto.jce.prng;
-import gnu.java.security.Registry;
-import gnu.javax.crypto.prng.CSPRNG;
import gnu.java.security.prng.IRandom;
import gnu.java.security.prng.LimitReachedException;
+import gnu.javax.crypto.prng.CSPRNG;
import java.net.MalformedURLException;
import java.security.SecureRandomSpi;
Index: TMMHParameterSpec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java,v
retrieving revision 1.1
diff -u -r1.1 TMMHParameterSpec.java
--- TMMHParameterSpec.java 26 Jan 2006 02:25:09 -0000 1.1
+++ TMMHParameterSpec.java 4 Jun 2006 06:34:42 -0000
@@ -45,7 +45,7 @@
/**
* This class represents the algorithm parameters for the Truncated
* Multi-Modular Hash function for use with JCE-derived instances of
- * [EMAIL PROTECTED] gnu.crypto.mac.TMMH16}.
+ * [EMAIL PROTECTED] gnu.javax.crypto.mac.TMMH16}.
*
* <p>This class is little more than a container for the key stream, tag
* length, and prefix parameters for the TMMH algorithm.
Index: GnuDHPrivateKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java,v
retrieving revision 1.2
diff -u -r1.2 GnuDHPrivateKey.java
--- GnuDHPrivateKey.java 12 Feb 2006 08:57:57 -0000 1.2
+++ GnuDHPrivateKey.java 4 Jun 2006 06:35:42 -0000
@@ -154,7 +154,7 @@
* @return the byte sequence encoding this key according to the designated
* format.
* @exception IllegalArgumentException if the format is not supported.
- * @see gnu.crypto.key.dh.DHKeyPairRawCodec
+ * @see DHKeyPairRawCodec
*/
public byte[] getEncoded(int format)
{
Index: AuthenticatedEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java,v
retrieving revision 1.1
diff -u -r1.1 AuthenticatedEntry.java
--- AuthenticatedEntry.java 26 Jan 2006 02:25:09 -0000 1.1
+++ AuthenticatedEntry.java 4 Jun 2006 06:36:39 -0000
@@ -38,25 +38,20 @@
package gnu.javax.crypto.keyring;
+import gnu.java.security.Registry;
+import gnu.javax.crypto.mac.IMac;
+import gnu.javax.crypto.mac.MacFactory;
+import gnu.javax.crypto.mac.MacOutputStream;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-
import java.security.InvalidKeyException;
-
import java.util.Arrays;
-import java.util.Date;
-import java.util.Iterator;
import java.util.HashMap;
-import java.util.List;
-
-import gnu.java.security.Registry;
-import gnu.javax.crypto.mac.IMac;
-import gnu.javax.crypto.mac.MacFactory;
-import gnu.javax.crypto.mac.MacInputStream;
-import gnu.javax.crypto.mac.MacOutputStream;
+import java.util.Iterator;
public final class AuthenticatedEntry extends MaskableEnvelopeEntry implements
Registry
Index: CertificateEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/CertificateEntry.java,v
retrieving revision 1.1
diff -u -r1.1 CertificateEntry.java
--- CertificateEntry.java 26 Jan 2006 02:25:09 -0000 1.1
+++ CertificateEntry.java 4 Jun 2006 06:37:26 -0000
@@ -39,13 +39,11 @@
package gnu.javax.crypto.keyring;
import java.io.DataInputStream;
-import java.io.DataOutputStream;
import java.io.IOException;
import java.security.cert.Certificate;
import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
import java.util.Date;
/**
Index: CertPathEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/CertPathEntry.java,v
retrieving revision 1.1
diff -u -r1.1 CertPathEntry.java
--- CertPathEntry.java 26 Jan 2006 02:25:09 -0000 1.1
+++ CertPathEntry.java 4 Jun 2006 06:38:06 -0000
@@ -40,14 +40,11 @@
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
-import java.io.DataOutputStream;
import java.io.IOException;
-
import java.security.cert.Certificate;
import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
-
import java.util.Date;
/**
Index: EncryptedEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/EncryptedEntry.java,v
retrieving revision 1.1
diff -u -r1.1 EncryptedEntry.java
--- EncryptedEntry.java 26 Jan 2006 02:25:09 -0000 1.1
+++ EncryptedEntry.java 4 Jun 2006 06:38:49 -0000
@@ -38,21 +38,6 @@
package gnu.javax.crypto.keyring;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import java.security.InvalidKeyException;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.HashMap;
-import java.util.List;
-
import gnu.java.security.Registry;
import gnu.javax.crypto.cipher.CipherFactory;
import gnu.javax.crypto.cipher.IBlockCipher;
@@ -62,6 +47,15 @@
import gnu.javax.crypto.pad.PadFactory;
import gnu.javax.crypto.pad.WrongPaddingException;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.security.InvalidKeyException;
+import java.util.HashMap;
+import java.util.Iterator;
+
public class EncryptedEntry extends MaskableEnvelopeEntry implements Registry
{
Index: PublicKeyEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/keyring/PublicKeyEntry.java,v
retrieving revision 1.1
diff -u -r1.1 PublicKeyEntry.java
--- PublicKeyEntry.java 26 Jan 2006 02:25:09 -0000 1.1
+++ PublicKeyEntry.java 4 Jun 2006 06:39:38 -0000
@@ -38,22 +38,19 @@
package gnu.javax.crypto.keyring;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import java.security.PublicKey;
-import java.security.KeyFactory;
-import java.security.spec.X509EncodedKeySpec;
-
-import java.util.Date;
-
import gnu.java.security.key.IKeyPairCodec;
import gnu.java.security.key.KeyPairCodecFactory;
import gnu.java.security.key.dss.DSSPublicKey;
import gnu.java.security.key.rsa.GnuRSAPublicKey;
import gnu.javax.crypto.key.dh.GnuDHPublicKey;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.security.KeyFactory;
+import java.security.PublicKey;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Date;
+
public final class PublicKeyEntry extends PrimitiveEntry
{
Index: OMAC.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/mac/OMAC.java,v
retrieving revision 1.1
diff -u -r1.1 OMAC.java
--- OMAC.java 26 Jan 2006 02:25:09 -0000 1.1
+++ OMAC.java 4 Jun 2006 06:40:29 -0000
@@ -43,10 +43,8 @@
import gnu.javax.crypto.cipher.CipherFactory;
import gnu.javax.crypto.cipher.IBlockCipher;
import gnu.javax.crypto.mode.IMode;
-import gnu.javax.crypto.mode.ModeFactory;
import java.security.InvalidKeyException;
-
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
Index: BaseMode.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/mode/BaseMode.java,v
retrieving revision 1.1
diff -u -r1.1 BaseMode.java
--- BaseMode.java 26 Jan 2006 02:25:09 -0000 1.1
+++ BaseMode.java 4 Jun 2006 06:41:34 -0000
@@ -146,7 +146,7 @@
* of the method(s) available in the factory class.</p>
*
* @return the default value, in bytes, of the mode's block size.
- * @see gnu.crypto.mode.ModeFactory
+ * @see ModeFactory
*/
public int defaultBlockSize()
{
Index: CTR.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/mode/CTR.java,v
retrieving revision 1.1
diff -u -r1.1 CTR.java
--- CTR.java 26 Jan 2006 02:25:09 -0000 1.1
+++ CTR.java 4 Jun 2006 06:42:16 -0000
@@ -40,10 +40,8 @@
import gnu.java.security.Registry;
import gnu.java.security.util.Sequence;
-
import gnu.javax.crypto.cipher.IBlockCipher;
-import java.math.BigInteger;
import java.util.Arrays;
import java.util.Iterator;
Index: IPad.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/pad/IPad.java,v
retrieving revision 1.1
diff -u -r1.1 IPad.java
--- IPad.java 26 Jan 2006 02:25:09 -0000 1.1
+++ IPad.java 4 Jun 2006 06:43:34 -0000
@@ -44,7 +44,7 @@
* <p>Padding algorithms serve to <i>pad</i> and <i>unpad</i> byte arrays usually
* as the last step in an <i>encryption</i> or respectively a <i>decryption</i>
* operation. Their input buffers are usually those processed by instances of
- * [EMAIL PROTECTED] gnu.crypto.mode.IMode} and/or [EMAIL PROTECTED] gnu.crypto.cipher.IBlockCipher}.</p>
+ * [EMAIL PROTECTED] gnu.javax.crypto.mode.IMode} and/or [EMAIL PROTECTED] gnu.javax.crypto.cipher.IBlockCipher}.</p>
*/
public interface IPad
{
Index: PKCS1_V1_5.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java,v
retrieving revision 1.2
diff -u -r1.2 PKCS1_V1_5.java
--- PKCS1_V1_5.java 3 Feb 2006 19:29:01 -0000 1.2
+++ PKCS1_V1_5.java 4 Jun 2006 06:44:20 -0000
@@ -92,7 +92,7 @@
* <p>Trivial package-private constructor for use by the <i>Factory</i> class.
* </p>
*
- * @see gnu.crypto.pad.PadFactory
+ * @see PadFactory
*/
PKCS1_V1_5()
{
Index: PKCS7.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/pad/PKCS7.java,v
retrieving revision 1.1
diff -u -r1.1 PKCS7.java
--- PKCS7.java 26 Jan 2006 02:25:09 -0000 1.1
+++ PKCS7.java 4 Jun 2006 06:45:00 -0000
@@ -86,7 +86,7 @@
/**
* Trivial package-private constructor for use by the <i>Factory</i> class.<p>
*
- * @see gnu.crypto.pad.PadFactory
+ * @see PadFactory
*/
PKCS7()
{
Index: TBC.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/pad/TBC.java,v
retrieving revision 1.1
diff -u -r1.1 TBC.java
--- TBC.java 26 Jan 2006 02:25:09 -0000 1.1
+++ TBC.java 4 Jun 2006 06:45:40 -0000
@@ -85,7 +85,7 @@
/**
* Trivial package-private constructor for use by the <i>Factory</i> class.<p>
*
- * @see gnu.crypto.pad.PadFactory
+ * @see PadFactory
*/
TBC()
{
Index: TLS1.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/pad/TLS1.java,v
retrieving revision 1.1
diff -u -r1.1 TLS1.java
--- TLS1.java 26 Jan 2006 02:25:09 -0000 1.1
+++ TLS1.java 4 Jun 2006 06:46:27 -0000
@@ -38,8 +38,6 @@
package gnu.javax.crypto.pad;
-import gnu.java.security.util.Util;
-
/**
* The padding scheme used by the Transport Layer Security protocol,
* version 1. This padding scheme is used in the block-ciphered struct,
Index: CSPRNG.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/prng/CSPRNG.java,v
retrieving revision 1.2
diff -u -r1.2 CSPRNG.java
--- CSPRNG.java 21 Apr 2006 10:52:26 -0000 1.2
+++ CSPRNG.java 4 Jun 2006 06:47:21 -0000
@@ -48,7 +48,6 @@
import gnu.java.security.prng.LimitReachedException;
import gnu.java.security.util.SimpleList;
import gnu.java.security.util.Util;
-
import gnu.javax.crypto.cipher.CipherFactory;
import gnu.javax.crypto.cipher.IBlockCipher;
@@ -56,15 +55,11 @@
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.PrintStream;
-
import java.net.MalformedURLException;
import java.net.URL;
-
import java.security.AccessController;
import java.security.InvalidKeyException;
import java.security.PrivilegedAction;
-
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
@@ -114,7 +109,7 @@
* <li>A [EMAIL PROTECTED] String}, indicating the path to the file.</li>
* </ol>
*
- * @see gnu.crypto.util.SimpleList
+ * @see gnu.java.security.util.SimpleList
*/
public static final String FILE_SOURCES = "gnu.crypto.prng.pool.files";
@@ -332,7 +327,7 @@
* and its arguments.</p></dd>
*
* <dt>gnu.crypto.cspring.other</dt>
- * <dd><p>These properties are other sources, passed as the [EMAIL PROTECTED] OTHER_SOURCES}
+ * <dd><p>These properties are other sources, passed as the [EMAIL PROTECTED] #OTHER_SOURCES}
* parameter of the instance. The property value must be the full name
* of a class that implements the [EMAIL PROTECTED] EntropySource} interface and has a
* public no-argument constructor.</p></dd>
@@ -994,7 +989,7 @@
// Field.
// -----------------------------------------------------------------------
- private byte counter;
+ protected byte counter;
// Constructor.
// -----------------------------------------------------------------------
Index: PasswordFile.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/sasl/srp/PasswordFile.java,v
retrieving revision 1.1
diff -u -r1.1 PasswordFile.java
--- PasswordFile.java 26 Jan 2006 02:25:10 -0000 1.1
+++ PasswordFile.java 4 Jun 2006 06:50:37 -0000
@@ -39,7 +39,6 @@
package gnu.javax.crypto.sasl.srp;
import gnu.java.security.Registry;
-import gnu.java.security.hash.IMessageDigest;
import gnu.java.security.util.Util;
import gnu.javax.crypto.key.srp6.SRPAlgorithm;
import gnu.javax.crypto.sasl.NoSuchUserException;
@@ -50,9 +49,9 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.IOException;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
Index: SRPRegistry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/sasl/srp/SRPRegistry.java,v
retrieving revision 1.1
diff -u -r1.1 SRPRegistry.java
--- SRPRegistry.java 26 Jan 2006 02:25:10 -0000 1.1
+++ SRPRegistry.java 4 Jun 2006 06:51:19 -0000
@@ -140,7 +140,7 @@
/**
* Name of the SRP password database property --a reference to
- * [EMAIL PROTECTED] gnu.crypto.sasl.srp.PasswordFile} object.
+ * [EMAIL PROTECTED] PasswordFile} object.
*/
String PASSWORD_DB = "gnu.crypto.sasl.srp.password.db";
Index: SaslUtil.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/sasl/SaslUtil.java,v
retrieving revision 1.1
diff -u -r1.1 SaslUtil.java
--- SaslUtil.java 26 Jan 2006 02:25:09 -0000 1.1
+++ SaslUtil.java 4 Jun 2006 06:52:07 -0000
@@ -40,7 +40,6 @@
import gnu.java.security.util.Util;
-import java.math.BigInteger;
import java.security.MessageDigest;
/**
