summaryrefslogtreecommitdiffstats
path: root/base/common/src
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2017-02-21 00:04:44 -0500
committerAde Lee <alee@redhat.com>2017-03-06 23:58:47 -0500
commitb445d327ce696cd7fbbe8ba3eafc87addf07ec54 (patch)
tree00c72b13b36ab216bfc8ba3cf929fe66c1a95e66 /base/common/src
parent83fe6e6d8500f13f888e140100363b02eccb07fa (diff)
downloadpki-b445d327ce696cd7fbbe8ba3eafc87addf07ec54.tar.gz
pki-b445d327ce696cd7fbbe8ba3eafc87addf07ec54.tar.xz
pki-b445d327ce696cd7fbbe8ba3eafc87addf07ec54.zip
Parameterize crypto functions, part 3
The crypto functions to unwrap the session key have been parameterized.
Diffstat (limited to 'base/common/src')
-rw-r--r--base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java2
-rw-r--r--base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java5
2 files changed, 4 insertions, 3 deletions
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