From b445d327ce696cd7fbbe8ba3eafc87addf07ec54 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Tue, 21 Feb 2017 00:04:44 -0500 Subject: Parameterize crypto functions, part 3 The crypto functions to unwrap the session key have been parameterized. --- base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java | 2 +- base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'base/common/src/com') diff --git a/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java b/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java index c299ce5bc..822736c13 100644 --- a/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java +++ b/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java @@ -141,7 +141,7 @@ public interface IEncryptionUnit extends IToken { */ public SymmetricKey unwrap_session_key(CryptoToken token, byte encSymmKey[], - SymmetricKey.Usage usage); + SymmetricKey.Usage usage, WrappingParams params); public PrivateKey unwrap_temp(byte privateKey[], PublicKey pubKey) throws EBaseException; diff --git a/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java b/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java index 825bd3ac8..11901fa3d 100644 --- a/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java +++ b/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java @@ -71,7 +71,8 @@ public interface ITransportKeyUnit extends IEncryptionUnit { * @return Symmetric key object */ - public SymmetricKey unwrap_session_key(CryptoToken token, byte encSymmKey[], SymmetricKey.Usage usage); + public SymmetricKey unwrap_session_key(CryptoToken token, byte encSymmKey[], SymmetricKey.Usage usage, + WrappingParams params); /** * Unwraps symmetric key . This method @@ -81,7 +82,7 @@ public interface ITransportKeyUnit extends IEncryptionUnit { * @return Symmetric key object */ - public SymmetricKey unwrap_sym(byte encSymmKey[]); + public SymmetricKey unwrap_sym(byte encSymmKey[], WrappingParams params); /** * Unwraps temporary private key . This method -- cgit