diff options
| author | Jack Magne <jmagne@redhat.com> | 2012-02-13 16:27:13 -0800 |
|---|---|---|
| committer | Jack Magne <jmagne@redhat.com> | 2012-02-13 19:02:41 -0800 |
| commit | 2f1ae9843d7239e970effa5e4692f3c4ab2eff6f (patch) | |
| tree | 7ea9f519769ad7c13eeb06579092e5d766d1a3ac /pki/base/common/src/com | |
| parent | a9680c7b7097c6b715c57c6581d4f24a5e4ee8b8 (diff) | |
| download | pki-2f1ae9843d7239e970effa5e4692f3c4ab2eff6f.tar.gz pki-2f1ae9843d7239e970effa5e4692f3c4ab2eff6f.tar.xz pki-2f1ae9843d7239e970effa5e4692f3c4ab2eff6f.zip | |
KRA symmetric key cmake support.
Changes to make the cmake build of this feature work.
Change to the .classpath to allow the DRMTest.java test client to run under Eclipse,
by adding additional jar paths to allow the client to run.
Diffstat (limited to 'pki/base/common/src/com')
| -rw-r--r-- | pki/base/common/src/com/netscape/certsrv/request/IRequest.java | 2 | ||||
| -rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequest.java b/pki/base/common/src/com/netscape/certsrv/request/IRequest.java index ec1f43fb3..e43856e2d 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequest.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequest.java @@ -160,6 +160,8 @@ public interface IRequest { public static final String SECURITY_DATA_SESS_PASS_PHRASE = "sessionWrappedPassphrase"; public static final String SECURITY_DATA_IV_STRING_IN = "iv_in"; public static final String SECURITY_DATA_IV_STRING_OUT = "iv_out"; + public static final String SECURITY_DATA_SESS_WRAPPED_DATA = "sessWrappedSecData"; + public static final String SECURITY_DATA_PASS_WRAPPED_DATA = "passPhraseWrappedData"; // requestor type values. diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java b/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java index fd9d2d2c0..6a90a7c8f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java @@ -23,8 +23,6 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.List; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import com.netscape.certsrv.apps.CMS; @@ -37,7 +35,6 @@ import com.netscape.certsrv.request.IRequestQueue; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; import com.netscape.cms.servlet.request.model.RecoveryRequestData; -import com.netscape.kra.SecurityDataRecoveryService; /** * @author alee @@ -116,8 +113,8 @@ public class KeyDAO { throw new EBaseException("Can't obtain Volatile requestParams in KeyDAO.getKey!"); } - String sessWrappedKeyData = (String) requestParams.get(SecurityDataRecoveryService.ATTR_SESS_WRAPPED_DATA); - String passWrappedKeyData = (String) requestParams.get(SecurityDataRecoveryService.ATTR_PASS_WRAPPED_DATA); + String sessWrappedKeyData = (String) requestParams.get(IRequest.SECURITY_DATA_SESS_WRAPPED_DATA); + String passWrappedKeyData = (String) requestParams.get(IRequest.SECURITY_DATA_PASS_WRAPPED_DATA); String nonceData = (String) requestParams.get(IRequest.SECURITY_DATA_IV_STRING_OUT); if (sessWrappedKeyData != null || passWrappedKeyData != null) { @@ -164,8 +161,8 @@ public class KeyDAO { nonceData = null; keyData = new KeyData(); - sessWrappedKeyData = (String) requestParams.get(SecurityDataRecoveryService.ATTR_SESS_WRAPPED_DATA); - passWrappedKeyData = (String) requestParams.get(SecurityDataRecoveryService.ATTR_PASS_WRAPPED_DATA); + sessWrappedKeyData = (String) requestParams.get(IRequest.SECURITY_DATA_SESS_WRAPPED_DATA); + passWrappedKeyData = (String) requestParams.get(IRequest.SECURITY_DATA_PASS_WRAPPED_DATA); nonceData = (String) requestParams.get(IRequest.SECURITY_DATA_IV_STRING_OUT); } |