From 032e03cc442562c24e81887eee945324005d07d1 Mon Sep 17 00:00:00 2001
From: Matthew Harmsen <mharmsen@redhat.com>
Date: Wed, 22 Feb 2017 18:27:00 -0700
Subject: [PATCH] Bugzilla Bug #1425971 - Simple problem unwrapping AES sym
 keys on token

---
 jss-unwrap-AES-sym-keys-on-token.patch | 14 ++++++++++++++
 jss.spec                               |  7 ++++++-
 sources                                |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 jss-unwrap-AES-sym-keys-on-token.patch

diff --git a/jss-unwrap-AES-sym-keys-on-token.patch b/jss-unwrap-AES-sym-keys-on-token.patch
new file mode 100644
index 0000000..1a024c7
--- /dev/null
+++ b/jss-unwrap-AES-sym-keys-on-token.patch
@@ -0,0 +1,14 @@
+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;
+         }
diff --git a/jss.spec b/jss.spec
index b14b11e..04ed076 100644
--- a/jss.spec
+++ b/jss.spec
@@ -1,6 +1,6 @@
 Name:           jss
 Version:        4.2.6
-Release:        43%{?dist}
+Release:        44%{?dist}
 Summary:        Java Security Services (JSS)
 
 Group:          System Environment/Libraries
@@ -58,6 +58,7 @@ Patch30:        jss-VerifyCertificate-enhancement.patch
 Patch31:        jss-lunasaUnwrap.patch
 Patch32:        jss-symkey-enhancements.patch
 Patch33:        jss-crmf-envelopedData.patch
+Patch34:        jss-unwrap-AES-sym-keys-on-token.patch
 
 
 %description
@@ -108,6 +109,7 @@ This package contains the API documentation for JSS.
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p2
 
 %build
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
@@ -212,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 22 2017 Jack Magne <jmagne@redhat.com> - 4.2.6-44
+- Bugzilla Bug #1425971 - Simple problem unwrapping AES sym keys on token
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.6-43
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 8e021c1..a5d5ca3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad1c59a92ddac35cce35f16341d3cd55  jss-4.2.6.tar.gz
+SHA512 (jss-4.2.6.tar.gz) = 5827c0fd192f0ec52798df2304619367c67366bfe19e8dc7bd0aa882efa6c62afbc5e9ae576d168f9666a9af1de66334995c9411f0f60623e752af5fe1194915