2006-06-04 Raif S. Naffah <raif@swiftdsl.com.au>

	* 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.

36 files changed, 82 insertions, 134 deletions

diff --git a/ChangeLog b/ChangeLog
index ca430ecfa..69af11c8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,45 @@
 2006-06-04  Raif S. Naffah  <raif@swiftdsl.com.au>
 
+	* 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.
+
+2006-06-04  Raif S. Naffah  <raif@swiftdsl.com.au>
+
 	* gnu/java/security/PolicyFile.java: Updated copyright year.
 	(logger): Increased visibility.
 	* gnu/java/security/x509/Util.java: Updated copyright year.
diff --git a/gnu/javax/crypto/assembly/Cascade.java b/gnu/javax/crypto/assembly/Cascade.java
index 678a7e730..a35d66886 100644
--- a/gnu/javax/crypto/assembly/Cascade.java
+++ b/gnu/javax/crypto/assembly/Cascade.java
@@ -60,7 +60,7 @@ import java.util.Set;
  * of identical ciphers).</p>
  *
  * <p>The term "block ciphers" used above refers to implementations of
- * {@link gnu.crypto.mode.IMode}, including the {@link gnu.crypto.mode.ECB}
+ * {@link gnu.javax.crypto.mode.IMode}, including the {@link gnu.javax.crypto.mode.ECB}
  * mode which basically exposes a symmetric-key block cipher algorithm as a
  * <i>Mode</i> of Operations.</p>
  *
diff --git a/gnu/javax/crypto/assembly/Direction.java b/gnu/javax/crypto/assembly/Direction.java
index 58b59a630..935b9618e 100644
--- a/gnu/javax/crypto/assembly/Direction.java
+++ b/gnu/javax/crypto/assembly/Direction.java
@@ -45,9 +45,9 @@ package gnu.javax.crypto.assembly;
  *
  * <p>The possible values for this type are two:</p>
  * <ol>
- *    <li>FORWARD: equivalent to {@link gnu.crypto.mode.IMode#ENCRYPTION}, and
+ *    <li>FORWARD: equivalent to {@link gnu.javax.crypto.mode.IMode#ENCRYPTION}, and
  *    its inverse value</li>
- *    <li>REVERSED: equivalent to {@link gnu.crypto.mode.IMode#DECRYPTION}.</li>
+ *    <li>REVERSED: equivalent to {@link gnu.javax.crypto.mode.IMode#DECRYPTION}.</li>
  * </ol>
  */
 public final class Direction
diff --git a/gnu/javax/crypto/assembly/Transformer.java b/gnu/javax/crypto/assembly/Transformer.java
index 80430dc19..74a619af0 100644
--- a/gnu/javax/crypto/assembly/Transformer.java
+++ b/gnu/javax/crypto/assembly/Transformer.java
@@ -47,7 +47,7 @@ import java.util.Map;
  * <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:
- * {@link Cascade} cipher, {@link gnu.crypto.pad.IPad} algorithm, and a
+ * {@link Cascade} cipher, {@link 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>
  *
diff --git a/gnu/javax/crypto/cipher/BaseCipher.java b/gnu/javax/crypto/cipher/BaseCipher.java
index 9d62311ed..f6d92994d 100644
--- a/gnu/javax/crypto/cipher/BaseCipher.java
+++ b/gnu/javax/crypto/cipher/BaseCipher.java
@@ -38,8 +38,6 @@ exception statement from your version.  */
 
 package gnu.javax.crypto.cipher;
 
-import gnu.java.security.util.Util;
-
 import java.security.InvalidKeyException;
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/gnu/javax/crypto/cipher/IBlockCipherSpi.java b/gnu/javax/crypto/cipher/IBlockCipherSpi.java
index 6fe07ca7f..046f43f6f 100644
--- a/gnu/javax/crypto/cipher/IBlockCipherSpi.java
+++ b/gnu/javax/crypto/cipher/IBlockCipherSpi.java
@@ -43,7 +43,7 @@ import java.util.Iterator;
 
 /**
  * <p>Package-private interface exposing mandatory methods to be implemented by
- * concrete {@link gnu.crypto.cipher.BaseCipher} sub-classes.</p>
+ * concrete {@link gnu.javax.crypto.cipher.BaseCipher} sub-classes.</p>
  */
 interface IBlockCipherSpi extends Cloneable
 {
diff --git a/gnu/javax/crypto/jce/cipher/CipherAdapter.java b/gnu/javax/crypto/jce/cipher/CipherAdapter.java
index 5eaa31b77..f8adedce7 100644
--- a/gnu/javax/crypto/jce/cipher/CipherAdapter.java
+++ b/gnu/javax/crypto/jce/cipher/CipherAdapter.java
@@ -118,9 +118,9 @@ class CipherAdapter extends CipherSpi
 
   /**
    * <p>Protected constructor to be called by subclasses. The cipher name
-   * argument should be the appropriate one listed in {@link gnu.crypto.Registry}.
+   * argument should be the appropriate one listed in {@link gnu.java.security.Registry}.
    * The basic cipher instance is created, along with an instance of the
-   * {@link gnu.crypto.mode.ECB} mode and no padding.</p>
+   * {@link gnu.javax.crypto.mode.ECB} mode and no padding.</p>
    *
    * @param cipherName The cipher to instantiate.
    * @param blockLen The block length to use.
diff --git a/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java b/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java
index f9725eae0..6442cd696 100644
--- a/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java
+++ b/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java
@@ -38,13 +38,6 @@ exception statement from your version.  */
 
 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()
diff --git a/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java b/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java
index 4b3620bc1..91f97af36 100644
--- a/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java
+++ b/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java
@@ -38,13 +38,6 @@ exception statement from your version.  */
 
 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()
diff --git a/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java b/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java
index 4bd31711e..048b54474 100644
--- a/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java
+++ b/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java
@@ -38,13 +38,6 @@ exception statement from your version.  */
 
 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()
diff --git a/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java b/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java
index c86e01110..6c7ab42f7 100644
--- a/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java
+++ b/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java
@@ -37,13 +37,6 @@ exception statement from your version.  */
 
 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()
diff --git a/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java b/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java
index 4aab584a2..d46191644 100644
--- a/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java
+++ b/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java
@@ -37,13 +37,6 @@ exception statement from your version.  */
 
 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()
diff --git a/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java b/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java
index 6e80671fa..9f06bf329 100644
--- a/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java
+++ b/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java
@@ -37,13 +37,6 @@ exception statement from your version.  */
 
 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()
diff --git a/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java b/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java
index d1d5d5514..fce7375b3 100644
--- a/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java
+++ b/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java
@@ -37,13 +37,6 @@ exception statement from your version.  */
 
 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()
diff --git a/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java b/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java
index e6ca80b63..a182d4116 100644
--- a/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java
+++ b/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java
@@ -37,13 +37,6 @@ exception statement from your version.  */
 
 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()
diff --git a/gnu/javax/crypto/jce/mac/OMacImpl.java b/gnu/javax/crypto/jce/mac/OMacImpl.java
index f91902ae5..bf30d8e13 100644
--- a/gnu/javax/crypto/jce/mac/OMacImpl.java
+++ b/gnu/javax/crypto/jce/mac/OMacImpl.java
@@ -39,7 +39,6 @@ exception statement from your version.  */
 package gnu.javax.crypto.jce.mac;
 
 import gnu.java.security.Registry;
-import javax.crypto.MacSpi;
 
 public abstract class OMacImpl extends MacAdapter
 {
diff --git a/gnu/javax/crypto/jce/prng/CSPRNGSpi.java b/gnu/javax/crypto/jce/prng/CSPRNGSpi.java
index c0aa015b0..acc0c8e84 100644
--- a/gnu/javax/crypto/jce/prng/CSPRNGSpi.java
+++ b/gnu/javax/crypto/jce/prng/CSPRNGSpi.java
@@ -38,10 +38,9 @@ exception statement from your version.  */
 
 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;
diff --git a/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java b/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java
index 0ebec0991..a3b5f26e8 100644
--- a/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java
+++ b/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java
@@ -45,7 +45,7 @@ import java.security.spec.AlgorithmParameterSpec;
 /**
  * This class represents the algorithm parameters for the Truncated
  * Multi-Modular Hash function for use with JCE-derived instances of
- * {@link gnu.crypto.mac.TMMH16}.
+ * {@link 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.
diff --git a/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java b/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java
index 0e71623b9..70b684b77 100644
--- a/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java
+++ b/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java
@@ -154,7 +154,7 @@ public class GnuDHPrivateKey extends GnuDHKey implements DHPrivateKey
    * @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)
   {
diff --git a/gnu/javax/crypto/keyring/AuthenticatedEntry.java b/gnu/javax/crypto/keyring/AuthenticatedEntry.java
index 22b42b3ea..fa77c6ec6 100644
--- a/gnu/javax/crypto/keyring/AuthenticatedEntry.java
+++ b/gnu/javax/crypto/keyring/AuthenticatedEntry.java
@@ -38,25 +38,20 @@ exception statement from your version.  */
 
 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
diff --git a/gnu/javax/crypto/keyring/CertPathEntry.java b/gnu/javax/crypto/keyring/CertPathEntry.java
index ef62347ec..f9e523b2c 100644
--- a/gnu/javax/crypto/keyring/CertPathEntry.java
+++ b/gnu/javax/crypto/keyring/CertPathEntry.java
@@ -40,14 +40,11 @@ package gnu.javax.crypto.keyring;
 
 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;
 
 /**
diff --git a/gnu/javax/crypto/keyring/CertificateEntry.java b/gnu/javax/crypto/keyring/CertificateEntry.java
index 95a708ac5..67ac7bf4b 100644
--- a/gnu/javax/crypto/keyring/CertificateEntry.java
+++ b/gnu/javax/crypto/keyring/CertificateEntry.java
@@ -39,13 +39,11 @@ exception statement from your version.  */
 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;
 
 /**
diff --git a/gnu/javax/crypto/keyring/EncryptedEntry.java b/gnu/javax/crypto/keyring/EncryptedEntry.java
index fad5f54b2..a47a3c6fa 100644
--- a/gnu/javax/crypto/keyring/EncryptedEntry.java
+++ b/gnu/javax/crypto/keyring/EncryptedEntry.java
@@ -38,21 +38,6 @@ exception statement from your version.  */
 
 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.IPad;
 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
 {
 
diff --git a/gnu/javax/crypto/keyring/PublicKeyEntry.java b/gnu/javax/crypto/keyring/PublicKeyEntry.java
index 528e70cc6..bc09445fd 100644
--- a/gnu/javax/crypto/keyring/PublicKeyEntry.java
+++ b/gnu/javax/crypto/keyring/PublicKeyEntry.java
@@ -38,22 +38,19 @@ exception statement from your version.  */
 
 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
 {
 
diff --git a/gnu/javax/crypto/mac/OMAC.java b/gnu/javax/crypto/mac/OMAC.java
index c83320a1b..21156ac63 100644
--- a/gnu/javax/crypto/mac/OMAC.java
+++ b/gnu/javax/crypto/mac/OMAC.java
@@ -43,10 +43,8 @@ import gnu.java.security.util.Util;
 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;
diff --git a/gnu/javax/crypto/mode/BaseMode.java b/gnu/javax/crypto/mode/BaseMode.java
index 0a9ab2dab..f230cbd72 100644
--- a/gnu/javax/crypto/mode/BaseMode.java
+++ b/gnu/javax/crypto/mode/BaseMode.java
@@ -146,7 +146,7 @@ public abstract class BaseMode implements IMode
    * 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()
   {
diff --git a/gnu/javax/crypto/mode/CTR.java b/gnu/javax/crypto/mode/CTR.java
index 49f4b9f3c..264d5399d 100644
--- a/gnu/javax/crypto/mode/CTR.java
+++ b/gnu/javax/crypto/mode/CTR.java
@@ -40,10 +40,8 @@ package gnu.javax.crypto.mode;
 
 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;
 
diff --git a/gnu/javax/crypto/pad/IPad.java b/gnu/javax/crypto/pad/IPad.java
index 4b4c925e6..9cef4f78b 100644
--- a/gnu/javax/crypto/pad/IPad.java
+++ b/gnu/javax/crypto/pad/IPad.java
@@ -44,7 +44,7 @@ package gnu.javax.crypto.pad;
  * <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
- * {@link gnu.crypto.mode.IMode} and/or {@link gnu.crypto.cipher.IBlockCipher}.</p>
+ * {@link gnu.javax.crypto.mode.IMode} and/or {@link gnu.javax.crypto.cipher.IBlockCipher}.</p>
  */
 public interface IPad
 {
diff --git a/gnu/javax/crypto/pad/PKCS1_V1_5.java b/gnu/javax/crypto/pad/PKCS1_V1_5.java
index 03c3d61a3..5f5a2cf47 100644
--- a/gnu/javax/crypto/pad/PKCS1_V1_5.java
+++ b/gnu/javax/crypto/pad/PKCS1_V1_5.java
@@ -92,7 +92,7 @@ public class PKCS1_V1_5 extends BasePad
    * <p>Trivial package-private constructor for use by the <i>Factory</i> class.
    * </p>
    *
-   * @see gnu.crypto.pad.PadFactory
+   * @see PadFactory
    */
   PKCS1_V1_5()
   {
diff --git a/gnu/javax/crypto/pad/PKCS7.java b/gnu/javax/crypto/pad/PKCS7.java
index 5697aff27..a5a1631a9 100644
--- a/gnu/javax/crypto/pad/PKCS7.java
+++ b/gnu/javax/crypto/pad/PKCS7.java
@@ -86,7 +86,7 @@ public final class PKCS7 extends BasePad
   /**
    * Trivial package-private constructor for use by the <i>Factory</i> class.<p>
    *
-   * @see gnu.crypto.pad.PadFactory
+   * @see PadFactory
    */
   PKCS7()
   {
diff --git a/gnu/javax/crypto/pad/TBC.java b/gnu/javax/crypto/pad/TBC.java
index 25c3e4286..c7e25cb23 100644
--- a/gnu/javax/crypto/pad/TBC.java
+++ b/gnu/javax/crypto/pad/TBC.java
@@ -85,7 +85,7 @@ public final class TBC extends BasePad
   /**
    * Trivial package-private constructor for use by the <i>Factory</i> class.<p>
    *
-   * @see gnu.crypto.pad.PadFactory
+   * @see PadFactory
    */
   TBC()
   {
diff --git a/gnu/javax/crypto/pad/TLS1.java b/gnu/javax/crypto/pad/TLS1.java
index 00a538f88..eb7e22d5d 100644
--- a/gnu/javax/crypto/pad/TLS1.java
+++ b/gnu/javax/crypto/pad/TLS1.java
@@ -38,8 +38,6 @@ exception statement from your version.  */
 
 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,
diff --git a/gnu/javax/crypto/prng/CSPRNG.java b/gnu/javax/crypto/prng/CSPRNG.java
index 6585dcb90..875ed9a0f 100644
--- a/gnu/javax/crypto/prng/CSPRNG.java
+++ b/gnu/javax/crypto/prng/CSPRNG.java
@@ -48,7 +48,6 @@ import gnu.java.security.prng.IRandom;
 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.ByteArrayOutputStream;
 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 @@ public class CSPRNG extends BasePRNG
    * <li>A {@link 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 @@ public class CSPRNG extends BasePRNG
    * and its arguments.</p></dd>
    *
    * <dt>gnu.crypto.cspring.other</dt>
-   * <dd><p>These properties are other sources, passed as the {@link OTHER_SOURCES}
+   * <dd><p>These properties are other sources, passed as the {@link #OTHER_SOURCES}
    * parameter of the instance. The property value must be the full name
    * of a class that implements the {@link EntropySource} interface and has a
    * public no-argument constructor.</p></dd>
@@ -994,7 +989,7 @@ public class CSPRNG extends BasePRNG
     // Field.
     // -----------------------------------------------------------------------
 
-    private byte counter;
+    protected byte counter;
 
     // Constructor.
     // -----------------------------------------------------------------------
diff --git a/gnu/javax/crypto/sasl/SaslUtil.java b/gnu/javax/crypto/sasl/SaslUtil.java
index e70312c0d..cb8d88e69 100644
--- a/gnu/javax/crypto/sasl/SaslUtil.java
+++ b/gnu/javax/crypto/sasl/SaslUtil.java
@@ -40,7 +40,6 @@ package gnu.javax.crypto.sasl;
 
 import gnu.java.security.util.Util;
 
-import java.math.BigInteger;
 import java.security.MessageDigest;
 
 /**
diff --git a/gnu/javax/crypto/sasl/srp/PasswordFile.java b/gnu/javax/crypto/sasl/srp/PasswordFile.java
index 1628a4167..70a4bb65c 100644
--- a/gnu/javax/crypto/sasl/srp/PasswordFile.java
+++ b/gnu/javax/crypto/sasl/srp/PasswordFile.java
@@ -39,7 +39,6 @@ exception statement from your version.  */
 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.File;
 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;
diff --git a/gnu/javax/crypto/sasl/srp/SRPRegistry.java b/gnu/javax/crypto/sasl/srp/SRPRegistry.java
index 262cbcba3..9f7bba8e9 100644
--- a/gnu/javax/crypto/sasl/srp/SRPRegistry.java
+++ b/gnu/javax/crypto/sasl/srp/SRPRegistry.java
@@ -140,7 +140,7 @@ public interface SRPRegistry
 
   /**
    * Name of the SRP password database property --a reference to
-   * {@link gnu.crypto.sasl.srp.PasswordFile} object.
+   * {@link PasswordFile} object.
    */
   String PASSWORD_DB = "gnu.crypto.sasl.srp.password.db";