15 lines
878 B
Diff
15 lines
878 B
Diff
|
diff -up ./jss-4.2.6.aes/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java.aes ./jss-4.2.6.aes/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java
|
||
|
|
--- ./jss-4.2.6.aes/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java.aes 2017-01-03 17:14:57.642278989 -0800
|
||
|
|
+++ ./jss-4.2.6.aes/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java 2017-01-03 17:44:03.220626460 -0800
|
||
|
|
@@ -617,7 +617,9 @@ final class PK11KeyWrapper implements Ke
|
||
|
|
return EncryptionAlgorithm.DES3_ECB;
|
||
|
|
} else if( type == SymmetricKey.RC4 ) {
|
||
|
|
return EncryptionAlgorithm.RC4;
|
||
|
|
- } else {
|
||
|
|
+ } else if( type == SymmetricKey.AES ) {
|
||
|
|
+ return EncryptionAlgorithm.AES_128_ECB;
|
||
|
|
+ } else {
|
||
|
|
Assert._assert( type == SymmetricKey.RC2 );
|
||
|
|
return EncryptionAlgorithm.RC2_CBC;
|
||
|
|
}
|