201245 convert SecretKey to SecretKeyFacade

security/jss/org/mozilla/jss/provider/javax/crypto/JSSCipherSpi.java

@@ -45,6 +45,8 @@ import javax.crypto.ShortBufferException;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.BadPaddingException;
 import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.SecretKey;
 import org.mozilla.jss.crypto.KeyWrapper;
 import org.mozilla.jss.crypto.KeyWrapAlgorithm;
 import org.mozilla.jss.crypto.EncryptionAlgorithm;
@@ -54,6 +56,7 @@ import org.mozilla.jss.crypto.Algorithm;
 import org.mozilla.jss.crypto.SecretKeyFacade;
 import org.mozilla.jss.crypto.SymmetricKey;
 import org.mozilla.jss.crypto.TokenException;
+import org.mozilla.jss.crypto.SecretKeyFacade;
 import org.mozilla.jss.crypto.TokenRuntimeException;
 import org.mozilla.jss.crypto.JSSSecureRandom;
 import org.mozilla.jss.CryptoManager;
@@ -94,6 +97,31 @@ class JSSCipherSpi extends javax.crypto.CipherSpi {
         this.algPadding = padding;
     }
 
+    static private SecretKey importKey(Key key)
+         throws InvalidKeyException
+    {
+        if (key instanceof SecretKey) {
+            SecretKey sKey = (SecretKey) key;
+            SecretKeyFactory fact = null;
+            try {
+                fact = SecretKeyFactory.getInstance(sKey.getAlgorithm(),
+                                                "Mozilla-JSS");
+            } catch (NoSuchAlgorithmException e) {
+                throw new InvalidKeyException(
+                                  "Unable to translate key with Algorithm"
+                                    + key.getAlgorithm());
+            } catch (NoSuchProviderException ex) {
+                throw new InvalidKeyException(
+                    "Unable to find provider, this should not happen");
+            }
+
+            return fact.translateKey(sKey);
+        }else {
+            throw new InvalidKeyException("Invalid key type: " +
+                                       key.getClass().getName());
+        }
+    }
+
     public void engineInit(int opmode, Key key,
         AlgorithmParameterSpec givenParams, SecureRandom random)
         throws InvalidKeyException, InvalidAlgorithmParameterException
@@ -127,8 +155,8 @@ class JSSCipherSpi extends javax.crypto.CipherSpi {
         }
 
         if( opmode == Cipher.ENCRYPT_MODE || opmode == Cipher.DECRYPT_MODE ) {
-            if( ! (key instanceof SecretKeyFacade) ) {
+            if( ! (key instanceof SecretKeyFacade) )  {
-                throw new InvalidKeyException("key must be JSS key");
+                key = importKey(key);
             }
             SymmetricKey symkey = ((SecretKeyFacade)key).key;
 
@@ -461,9 +489,9 @@ class JSSCipherSpi extends javax.crypto.CipherSpi {
             SymmetricKey symkey = ((SecretKeyFacade)key).key;
             return symkey.getLength();
         } else {
-            throw new InvalidKeyException(
+            key = importKey(key);
-                "Unsupported key type: " + key.getClass().getName() +
+            SymmetricKey symkey = ((SecretKeyFacade)key).key;
-                ". Only JSS keys are supported.");
+            return symkey.getLength();
         }
     }