summaryrefslogtreecommitdiffstats
path: root/base/java-tools
diff options
context:
space:
mode:
Diffstat (limited to 'base/java-tools')
-rw-r--r--base/java-tools/src/com/netscape/cmstools/client/ClientCertRequestCLI.java18
1 files changed, 12 insertions, 6 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/client/ClientCertRequestCLI.java b/base/java-tools/src/com/netscape/cmstools/client/ClientCertRequestCLI.java
index ebca55bc0..e6bd0d981 100644
--- a/base/java-tools/src/com/netscape/cmstools/client/ClientCertRequestCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/client/ClientCertRequestCLI.java
@@ -217,7 +217,7 @@ public class ClientCertRequestCLI extends CLI {
String encoded;
if (transportCertFilename == null) {
- SystemCertClient certClient = new SystemCertClient(client, "kra");
+ SystemCertClient certClient = new SystemCertClient(client, "ca");
encoded = certClient.getTransportCert().getEncoded();
} else {
@@ -251,13 +251,19 @@ public class ClientCertRequestCLI extends CLI {
CertEnrollmentRequest request = certClient.getEnrollmentTemplate(profileID);
- ProfileInput kg = request.getInput("Key Generation");
+ // Key Generation / Dual Key Generation
+ for (ProfileInput input : request.getInputs()) {
- ProfileAttribute typeAttr = kg.getAttribute("cert_request_type");
- typeAttr.setValue(requestType);
+ ProfileAttribute typeAttr = input.getAttribute("cert_request_type");
+ if (typeAttr != null) {
+ typeAttr.setValue(requestType);
+ }
- ProfileAttribute csrAttr = kg.getAttribute("cert_request");
- csrAttr.setValue(csr);
+ ProfileAttribute csrAttr = input.getAttribute("cert_request");
+ if (csrAttr != null) {
+ csrAttr.setValue(csr);
+ }
+ }
ProfileInput sn = request.getInput("Subject Name");
if (sn != null) {