diff options
| author | Ade Lee <alee@redhat.com> | 2017-02-17 16:31:21 -0500 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2017-03-06 23:56:49 -0500 |
| commit | b7a6c80dcbf311f4f16da4278ef46a87ea486d34 (patch) | |
| tree | 826605f165277de2bed79d29f6451b80f1de3be0 /base/common/src/com | |
| parent | 80afcc486ce05ea6320f959f7371bb918add5046 (diff) | |
| download | pki-b7a6c80dcbf311f4f16da4278ef46a87ea486d34.tar.gz pki-b7a6c80dcbf311f4f16da4278ef46a87ea486d34.tar.xz pki-b7a6c80dcbf311f4f16da4278ef46a87ea486d34.zip | |
Refactored EncryptionUnit
EncryptionUnit is a bit of a mess right now. Refactored so that
crypto specific code is in a few functions. These can now be
parameterized to allow selection of parameters for wrapping method,
algorithm etc.
Diffstat (limited to 'base/common/src/com')
| -rw-r--r-- | base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java | 3 | ||||
| -rw-r--r-- | base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java b/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java index 575dda72e..c299ce5bc 100644 --- a/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java +++ b/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java @@ -19,6 +19,7 @@ package com.netscape.certsrv.security; import java.security.PublicKey; +import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.crypto.PrivateKey; import org.mozilla.jss.crypto.SymmetricKey; import org.mozilla.jss.crypto.SymmetricKey.Type; @@ -139,7 +140,7 @@ public interface IEncryptionUnit extends IToken { * @return Symmetric key object */ - public SymmetricKey unwrap_sym(byte encSymmKey[], + public SymmetricKey unwrap_session_key(CryptoToken token, byte encSymmKey[], SymmetricKey.Usage usage); public PrivateKey unwrap_temp(byte privateKey[], PublicKey pubKey) diff --git a/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java b/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java index b371039ab..825bd3ac8 100644 --- a/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java +++ b/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java @@ -71,7 +71,7 @@ public interface ITransportKeyUnit extends IEncryptionUnit { * @return Symmetric key object */ - public SymmetricKey unwrap_sym(byte encSymmKey[], SymmetricKey.Usage usage); + public SymmetricKey unwrap_session_key(CryptoToken token, byte encSymmKey[], SymmetricKey.Usage usage); /** * Unwraps symmetric key . This method |