diff options
author | Ade Lee <alee@redhat.com> | 2014-02-24 15:31:12 -0500 |
---|---|---|
committer | Ade Lee <alee@redhat.com> | 2014-02-26 01:18:56 -0500 |
commit | 62d4b2b3934507b1ddf699bcea4a6295565bb008 (patch) | |
tree | 624b07de5aa7dc1b824f4094f3b3a1fb4fab2320 /base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java | |
parent | 4488bb70e2b762d5282fcf88f1c4a349300dd6ea (diff) | |
download | pki-62d4b2b3934507b1ddf699bcea4a6295565bb008.tar.gz pki-62d4b2b3934507b1ddf699bcea4a6295565bb008.tar.xz pki-62d4b2b3934507b1ddf699bcea4a6295565bb008.zip |
Add ability to archive without sending pkiArchiveOptions object.
With this patch, you can now either send a pkiArchiveOptions object
or the exploded parameters. This reduces the processing required on
the client side.
Diffstat (limited to 'base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java')
-rw-r--r-- | base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java index d84bbd013..93e0018c4 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java +++ b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java @@ -63,6 +63,11 @@ import com.netscape.cms.servlet.request.KeyRequestService; public class KeyRequestDAO extends CMSRequestDAO { private static String REQUEST_ARCHIVE_OPTIONS = IEnrollProfile.REQUEST_ARCHIVE_OPTIONS; + private static String REQUEST_SECURITY_DATA = IEnrollProfile.REQUEST_SECURITY_DATA; + private static String REQUEST_SESSION_KEY = IEnrollProfile.REQUEST_SESSION_KEY; + private static String REQUEST_ALGORITHM_OID = IEnrollProfile.REQUEST_ALGORITHM_OID; + private static String REQUEST_ALGORITHM_PARAMS = IEnrollProfile.REQUEST_ALGORITHM_PARAMS; + public static final String ATTR_SERIALNO = "serialNumber"; private IKeyRepository repo; @@ -140,6 +145,10 @@ public class KeyRequestDAO extends CMSRequestDAO { public KeyRequestResponse submitRequest(KeyArchivalRequest data, UriInfo uriInfo) throws EBaseException { String clientKeyId = data.getClientKeyId(); String wrappedSecurityData = data.getWrappedPrivateData(); + String transWrappedSessionKey = data.getTransWrappedSessionKey(); + String algorithmOID = data.getAlgorithmOID(); + String symkeyParams = data.getSymmetricAlgorithmParams(); + String pkiArchiveOptions = data.getPKIArchiveOptions(); String dataType = data.getDataType(); String keyAlgorithm = data.getKeyAlgorithm(); int keyStrength = data.getKeySize(); @@ -152,7 +161,14 @@ public class KeyRequestDAO extends CMSRequestDAO { IRequest request = queue.newRequest(IRequest.SECURITY_DATA_ENROLLMENT_REQUEST); - request.setExtData(REQUEST_ARCHIVE_OPTIONS, wrappedSecurityData); + if (pkiArchiveOptions != null) { + request.setExtData(REQUEST_ARCHIVE_OPTIONS, pkiArchiveOptions); + } else { + request.setExtData(REQUEST_SECURITY_DATA, wrappedSecurityData); + request.setExtData(REQUEST_SESSION_KEY, transWrappedSessionKey); + request.setExtData(REQUEST_ALGORITHM_PARAMS, symkeyParams); + request.setExtData(REQUEST_ALGORITHM_OID, algorithmOID); + } request.setExtData(IRequest.SECURITY_DATA_CLIENT_KEY_ID, clientKeyId); request.setExtData(IRequest.SECURITY_DATA_TYPE, dataType); request.setExtData(IRequest.SECURITY_DATA_STRENGTH, |