|
|
3fd438 |
From 606027b188fee6d20c17323d7c464d6630024a20 Mon Sep 17 00:00:00 2001
|
|
|
3fd438 |
From: Fraser Tweedale <ftweedal@redhat.com>
|
|
|
3fd438 |
Date: Wed, 23 Aug 2017 20:53:25 +1000
|
|
|
3fd438 |
Subject: [PATCH] Fix regression in lightweight CA replication
|
|
|
3fd438 |
|
|
|
3fd438 |
Fixes: https://pagure.io/dogtagpki/issue/2796
|
|
|
3fd438 |
Change-Id: Ic5e42b80156f777299f4e487932305160c2d48f6
|
|
|
3fd438 |
---
|
|
|
3fd438 |
base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java | 5 +++--
|
|
|
3fd438 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
3fd438 |
|
|
|
3fd438 |
diff --git a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
|
|
|
3fd438 |
index eca8dddb6..2daf0d797 100644
|
|
|
3fd438 |
--- a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
|
|
|
3fd438 |
+++ b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
|
|
|
3fd438 |
@@ -2307,8 +2307,9 @@ public class CryptoUtil {
|
|
|
3fd438 |
BIT_STRING encSymKey = encVal.getEncSymmKey();
|
|
|
3fd438 |
BIT_STRING encPrivKey = encVal.getEncValue();
|
|
|
3fd438 |
|
|
|
3fd438 |
- SymmetricKey sk = unwrap(token, SymmetricKey.Type.DES3, 0, null, unwrappingKey, encSymKey.getBits(),
|
|
|
3fd438 |
- KeyWrapAlgorithm.RSA);
|
|
|
3fd438 |
+ SymmetricKey sk = unwrap(
|
|
|
3fd438 |
+ token, SymmetricKey.Type.DES3, 0, SymmetricKey.Usage.UNWRAP,
|
|
|
3fd438 |
+ unwrappingKey, encSymKey.getBits(), KeyWrapAlgorithm.RSA);
|
|
|
3fd438 |
|
|
|
3fd438 |
ASN1Value v = algId.getParameters();
|
|
|
3fd438 |
v = ((ANY) v).decodeWith(new OCTET_STRING.Template());
|
|
|
3fd438 |
--
|
|
|
3fd438 |
2.13.5
|
|
|
3fd438 |
|