deprecate old classes in favor of the JCA.

security/jss/org/mozilla/jss/crypto/Cipher.java

@@ -46,6 +46,7 @@ import org.mozilla.jss.util.Assert;
  * it is not necessary to call <code>update</code> if all of the data is
  * available at once.  In this case, all of the input can be processed with one
  * call to <code>doFinal</code>.
+ * @deprecated Use the JCA interface instead ({@link javax.crypto.Cipher})
  */
 public abstract class Cipher {
 

security/jss/org/mozilla/jss/crypto/CryptoToken.java

@@ -57,6 +57,7 @@ public interface CryptoToken {
      * @param algorithm The algorithm used for the signing/verification.
      * @exception java.security.NoSuchAlgorithmException If the given
      *      algorithm is not supported by this provider.
+     * @deprecated Use the JCA interface instead ({@link java.security.Signature})
      */
     public abstract org.mozilla.jss.crypto.Signature
     getSignatureContext(SignatureAlgorithm algorithm)
@@ -69,6 +70,7 @@ public interface CryptoToken {
      * @param algorithm The algorithm used for digesting.
      * @exception java.security.NoSuchAlgorithmException If this provider
      *  does not support the given algorithm.
+     * @deprecated Use the JCA interface instead ({@link java.security.MessageDigest})
      */
     public abstract JSSMessageDigest
     getDigestContext(DigestAlgorithm algorithm)
@@ -84,11 +86,15 @@ public interface CryptoToken {
      * @param algorithm The algorithm used for encryption/decryption.
      * @exception java.security.NoSuchAlgorithmException If this provider
      *      does not support the given algorithm.
+     * @deprecated Use the JCA interface instead ({@link javax.crypto.Cipher})
      */
     public abstract Cipher
     getCipherContext(EncryptionAlgorithm algorithm)
         throws java.security.NoSuchAlgorithmException, TokenException;
 
+    /**
+     * @deprecated Use the JCA interface instead ({@link javax.crypto.Cipher})
+     */
     public abstract KeyWrapper
     getKeyWrapper(KeyWrapAlgorithm algorithm)
         throws java.security.NoSuchAlgorithmException, TokenException;
@@ -114,6 +120,7 @@ public interface CryptoToken {
      * @param algorithm The algorithm that the keys will be used with.
      * @exception java.security.NoSuchAlgorithmException If this token does not
      *      support the given algorithm.
+     * @deprecated Use the JCA interface instead ({@link javax.crypto.KeyGenerator})
      */
     public abstract KeyGenerator
     getKeyGenerator(KeyGenAlgorithm algorithm)
@@ -126,6 +133,7 @@ public interface CryptoToken {
      *      cannot be extracted from the current token.
      * @exception InvalidKeyException If the owning token cannot process
      *      the key to be cloned.
+     * @deprecated Use the JCA interface instead ({@link javax.crypto.SecretKeyFactory})
      */
     public SymmetricKey cloneKey(SymmetricKey key)
         throws SymmetricKey.NotExtractableException,
@@ -140,6 +148,7 @@ public interface CryptoToken {
      *      DSA, etc.)
      * @exception java.security.NoSuchAlgorithmException If this token does
      *      not support the given algorithm.
+     * @deprecated Use the JCA interface instead ({@link java.security.KeyPairGenerator})
      */
     public abstract KeyPairGenerator
     getKeyPairGenerator(KeyPairAlgorithm algorithm)

security/jss/org/mozilla/jss/crypto/JSSMessageDigest.java

@@ -38,6 +38,7 @@ import java.security.InvalidKeyException;
 
 /**
  * A class for performing message digesting (hashing) and MAC operations.
+ * @deprecated Use the JCA interface instead ({@link java.security.MessageDigest})
  */
 public abstract class JSSMessageDigest {
 

security/jss/org/mozilla/jss/crypto/JSSSecureRandom.java

@@ -34,10 +34,8 @@
 package org.mozilla.jss.crypto;
 
 /**
- * An interface for secure random numbers. This should be replaced with
- * java.security.SecureRandom when we move to JDK 1.2.  In JDK 1.1,
- * SecureRandom is implemented by a Sun class. In JDK 1.2, it uses a
- * provider architecture.
+ * An interface for secure random numbers.
+ * @deprecated Use the JCA interface instead ({@link java.security.SecureRandom})
  */
 public interface JSSSecureRandom {
 

security/jss/org/mozilla/jss/crypto/KeyGenerator.java

@@ -40,6 +40,7 @@ import java.io.CharConversionException;
 
 /**
  * Generates symmetric keys for encryption and decryption.
+ * @deprecated Use the JCA interface instead ({@link javax.crypto.KeyGenerator})
  */
 public interface KeyGenerator {
 

security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java

@@ -46,6 +46,7 @@ import java.security.spec.AlgorithmParameterSpec;
  * <code>keygenOnInternalToken</code> to find out if this is happening.
  *
  * @see org.mozilla.jss.crypto.CryptoToken#getKeyPairGenerator
+ * @deprecated Use the JCA interface instead ({@link java.security.KeyPairGenerator})
  */
 public class KeyPairGenerator {
 

security/jss/org/mozilla/jss/crypto/KeyWrapper.java

@@ -37,6 +37,9 @@ import java.security.InvalidAlgorithmParameterException;
 import java.security.PublicKey;
 import java.security.InvalidKeyException;
 
+/**
+ * @deprecated Use the JCA interface instead ({@link javax.crypto.Cipher})
+ */
 public interface KeyWrapper {
 
     public void initWrap(SymmetricKey wrappingKey,

security/jss/org/mozilla/jss/crypto/Signature.java

@@ -41,6 +41,7 @@ import java.security.spec.AlgorithmParameterSpec;
  * Instances of this class can be obtain from <code>CryptoToken</code>s.
  *
  * @see org.mozilla.jss.crypto.CryptoToken#getSignatureContext
+ * @deprecated Use the JCA interface instead ({@link java.security.Signature})
  */
 public class Signature {