summaryrefslogtreecommitdiffstats
path: root/base/kra
diff options
context:
space:
mode:
Diffstat (limited to 'base/kra')
-rw-r--r--base/kra/functional/src/com/netscape/cms/servlet/test/DRMClient.java16
-rw-r--r--base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java4
2 files changed, 10 insertions, 10 deletions
diff --git a/base/kra/functional/src/com/netscape/cms/servlet/test/DRMClient.java b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMClient.java
index 0f12eada2..dfb34ed13 100644
--- a/base/kra/functional/src/com/netscape/cms/servlet/test/DRMClient.java
+++ b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMClient.java
@@ -10,17 +10,17 @@ import com.netscape.certsrv.dbs.keydb.KeyId;
import com.netscape.certsrv.request.RequestId;
import com.netscape.cms.client.cli.ClientConfig;
import com.netscape.cms.servlet.admin.SystemCertificateResource;
-import com.netscape.cms.servlet.cert.model.CertificateData;
+import com.netscape.cms.servlet.cert.model.CertData;
import com.netscape.cms.servlet.csadmin.PKIClient;
import com.netscape.cms.servlet.key.KeyResource;
import com.netscape.cms.servlet.key.model.KeyData;
import com.netscape.cms.servlet.key.model.KeyDataInfo;
import com.netscape.cms.servlet.key.model.KeyDataInfos;
import com.netscape.cms.servlet.request.KeyRequestResource;
-import com.netscape.cms.servlet.request.model.ArchivalRequestData;
+import com.netscape.cms.servlet.request.model.KeyArchivalRequest;
import com.netscape.cms.servlet.request.model.KeyRequestInfo;
import com.netscape.cms.servlet.request.model.KeyRequestInfos;
-import com.netscape.cms.servlet.request.model.RecoveryRequestData;
+import com.netscape.cms.servlet.request.model.KeyRecoveryRequest;
import com.netscape.cmsutil.util.Utils;
public class DRMClient extends PKIClient {
@@ -39,9 +39,9 @@ public class DRMClient extends PKIClient {
public String getTransportCert() {
@SuppressWarnings("unchecked")
- ClientResponse<CertificateData> response = (ClientResponse<CertificateData>) systemCertClient
+ ClientResponse<CertData> response = (ClientResponse<CertData>) systemCertClient
.getTransportCert();
- CertificateData certData = getEntity(response);
+ CertData certData = getEntity(response);
String transportCert = certData.getEncoded();
return transportCert;
}
@@ -56,7 +56,7 @@ public class DRMClient extends PKIClient {
public KeyRequestInfo archiveSecurityData(byte[] encoded, String clientId, String dataType) {
// create archival request
- ArchivalRequestData data = new ArchivalRequestData();
+ KeyArchivalRequest data = new KeyArchivalRequest();
String req1 = Utils.base64encode(encoded);
data.setWrappedPrivateData(req1);
data.setClientId(clientId);
@@ -83,7 +83,7 @@ public class DRMClient extends PKIClient {
public KeyRequestInfo requestRecovery(KeyId keyId, byte[] rpwd, byte[] rkey, byte[] nonceData) {
// create recovery request
- RecoveryRequestData data = new RecoveryRequestData();
+ KeyRecoveryRequest data = new KeyRecoveryRequest();
data.setKeyId(keyId);
if (rpwd != null) {
data.setSessionWrappedPassphrase(Utils.base64encode(rpwd));
@@ -106,7 +106,7 @@ public class DRMClient extends PKIClient {
public KeyData retrieveKey(KeyId keyId, RequestId requestId, byte[] rpwd, byte[] rkey, byte[] nonceData) {
// create recovery request
- RecoveryRequestData data = new RecoveryRequestData();
+ KeyRecoveryRequest data = new KeyRecoveryRequest();
data.setKeyId(keyId);
data.setRequestId(requestId);
if (rkey != null) {
diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java
index 9a884f872..d8c0ece00 100644
--- a/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java
+++ b/base/kra/src/com/netscape/kra/KeyRecoveryAuthorityApplication.java
@@ -10,7 +10,7 @@ import com.netscape.cms.servlet.admin.GroupService;
import com.netscape.cms.servlet.admin.SystemCertService;
import com.netscape.cms.servlet.admin.UserCertService;
import com.netscape.cms.servlet.admin.UserService;
-import com.netscape.cms.servlet.base.CMSException;
+import com.netscape.cms.servlet.base.PKIException;
import com.netscape.cms.servlet.csadmin.SystemConfigService;
import com.netscape.cms.servlet.key.KeyService;
import com.netscape.cms.servlet.request.KeyRequestService;
@@ -38,7 +38,7 @@ public class KeyRecoveryAuthorityApplication extends Application {
classes.add(SystemCertService.class);
// exception mapper
- classes.add(CMSException.Mapper.class);
+ classes.add(PKIException.Mapper.class);
}