diff -up jss/org/mozilla/jss/crypto/Cipher.java.21 jss/org/mozilla/jss/crypto/Cipher.java

--- jss/org/mozilla/jss/crypto/Cipher.java.21	2016-08-10 14:59:55.655112871 -0700

+++ jss/org/mozilla/jss/crypto/Cipher.java	2016-08-10 14:59:55.677112622 -0700

@@ -17,7 +17,6 @@ import org.mozilla.jss.util.Assert;

  * it is not necessary to call update if all of the data is

  * available at once.  In this case, all of the input can be processed with one

  * call to doFinal.

- * @deprecated Use the JCA interface instead ({@link javax.crypto.Cipher})

  */

 public abstract class Cipher {

diff -up jss/org/mozilla/jss/crypto/CryptoToken.java.21 jss/org/mozilla/jss/crypto/CryptoToken.java

--- jss/org/mozilla/jss/crypto/CryptoToken.java.21	2016-08-10 14:59:55.655112871 -0700

+++ jss/org/mozilla/jss/crypto/CryptoToken.java	2016-08-10 14:59:55.677112622 -0700

@@ -28,7 +28,6 @@ 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)

@@ -41,7 +40,6 @@ 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)

@@ -57,15 +55,11 @@ 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;

@@ -91,7 +85,6 @@ 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)

@@ -104,7 +97,6 @@ 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,

@@ -119,7 +111,6 @@ public interface CryptoToken {

      *      DSA, EC, 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)

diff -up jss/org/mozilla/jss/crypto/JSSMessageDigest.java.21 jss/org/mozilla/jss/crypto/JSSMessageDigest.java

--- jss/org/mozilla/jss/crypto/JSSMessageDigest.java.21	2016-08-10 14:59:55.655112871 -0700

+++ jss/org/mozilla/jss/crypto/JSSMessageDigest.java	2016-08-10 14:59:55.677112622 -0700

@@ -9,7 +9,6 @@ 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 {

diff -up jss/org/mozilla/jss/crypto/JSSSecureRandom.java.21 jss/org/mozilla/jss/crypto/JSSSecureRandom.java

--- jss/org/mozilla/jss/crypto/JSSSecureRandom.java.21	2015-03-16 01:55:53.000000000 -0700

+++ jss/org/mozilla/jss/crypto/JSSSecureRandom.java	2016-08-10 14:59:55.677112622 -0700

@@ -6,7 +6,6 @@ package org.mozilla.jss.crypto;

 /**

  * An interface for secure random numbers.

- * @deprecated Use the JCA interface instead ({@link java.security.SecureRandom})

  */

 public interface JSSSecureRandom {

diff -up jss/org/mozilla/jss/crypto/KeyGenerator.java.21 jss/org/mozilla/jss/crypto/KeyGenerator.java

--- jss/org/mozilla/jss/crypto/KeyGenerator.java.21	2015-03-16 01:55:53.000000000 -0700

+++ jss/org/mozilla/jss/crypto/KeyGenerator.java	2016-08-10 14:59:55.677112622 -0700

@@ -11,7 +11,6 @@ import java.io.CharConversionException;

 /**

  * Generates symmetric keys for encryption and decryption.

- * @deprecated Use the JCA interface instead ({@link javax.crypto.KeyGenerator})

  */

 public interface KeyGenerator {

diff -up jss/org/mozilla/jss/crypto/KeyWrapper.java.21 jss/org/mozilla/jss/crypto/KeyWrapper.java

--- jss/org/mozilla/jss/crypto/KeyWrapper.java.21	2015-03-16 01:55:53.000000000 -0700

+++ jss/org/mozilla/jss/crypto/KeyWrapper.java	2016-08-10 14:59:55.678112610 -0700

@@ -8,9 +8,6 @@ import java.security.InvalidAlgorithmPar

 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,

diff -up jss/org/mozilla/jss/crypto/Signature.java.21 jss/org/mozilla/jss/crypto/Signature.java

--- jss/org/mozilla/jss/crypto/Signature.java.21	2015-03-16 01:55:53.000000000 -0700

+++ jss/org/mozilla/jss/crypto/Signature.java	2016-08-10 14:59:55.678112610 -0700

@@ -12,7 +12,6 @@ import java.security.spec.AlgorithmParam

  * Instances of this class can be obtain from CryptoTokens.

  *

  * @see org.mozilla.jss.crypto.CryptoToken#getSignatureContext

- * @deprecated Use the JCA interface instead ({@link java.security.Signature})

  */

 public class Signature { 

diff -up jss/org/mozilla/jss/tests/all.pl.21 jss/org/mozilla/jss/tests/all.pl

--- jss/org/mozilla/jss/tests/all.pl.21	2016-08-10 14:59:55.678112610 -0700

+++ jss/org/mozilla/jss/tests/all.pl	2016-08-10 15:05:18.331516544 -0700

@@ -505,6 +505,10 @@ $testname = "Mozilla-JSS JCA Signature "

 $command = "$java -cp $jss_classpath org.mozilla.jss.tests.JCASigTest $testdir $pwfile";

 run_test($testname, $command);

+$testname = "Mozilla-JSS NSS Signature ";

+$command = "$java -cp $jss_classpath org.mozilla.jss.tests.SigTest $testdir $pwfile";

+run_test($testname, $command);

+

 $testname = "JSS Signature test";

 $command = "$java -cp $jss_classpath org.mozilla.jss.tests.SigTest $testdir $pwfile";

 run_test($testname, $command);

diff -up jss/org/mozilla/jss/tests/SigTest.java.21 jss/org/mozilla/jss/tests/SigTest.java

--- jss/org/mozilla/jss/tests/SigTest.java.21	2016-08-10 14:59:55.678112610 -0700

+++ jss/org/mozilla/jss/tests/SigTest.java	2016-08-10 15:03:06.030974655 -0700

@@ -3,18 +3,10 @@

  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 /* This program demonstrates how to sign data with keys from JSS

  *

- * Most of this code is deprecated look at JCASigTest.java

- *

- * java -cp ./jss4.jar org.mozilla.jss.tests.SigTest . 

- *               passwords "Internal Key Storage Token"

- *

  * The token name can be either the name of a hardware token, or

  * one of the internal tokens:

  *  Internal Crypto Services Token

  *  Internal Key Storage Token    (keys stored in key4.db)

- *

- * @see org.mozilla.jss.tests.JCASigTest

- * @deprecated Use the JCA interface instead

  */

 package org.mozilla.jss.tests;

 import org.mozilla.jss.crypto.*;

 import org.mozilla.jss.crypto.Signature;

 import org.mozilla.jss.crypto.KeyPairGenerator;

 import org.mozilla.jss.crypto.KeyPairGeneratorSpi;

 import java.security.*;