summaryrefslogtreecommitdiffstats
path: root/base/java-tools/src
diff options
context:
space:
mode:
Diffstat (limited to 'base/java-tools/src')
-rw-r--r--base/java-tools/src/com/netscape/cmstools/CMCRequest.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
index 6e27cb100..9c4140304 100644
--- a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
@@ -2014,10 +2014,12 @@ public class CMCRequest {
certname.append(tokenName);
certname.append(":");
}
- certname.append(nickname);
- signerCert = cm.findCertByNickname(certname.toString());
- if (signerCert != null) {
- System.out.println("got signerCert: "+ certname.toString());
+ if (!selfSign.equals("true") && nickname != null) {
+ certname.append(nickname);
+ signerCert = cm.findCertByNickname(certname.toString());
+ if (signerCert != null) {
+ System.out.println("got signerCert: "+ certname.toString());
+ }
}
ContentInfo cmcblob = null;
@@ -2239,11 +2241,11 @@ public class CMCRequest {
// sign the request
SignedData signedData = null;
if (selfSign.equalsIgnoreCase("true")) {
- // selfSign signes with private key
+ // selfSign signs with private key
System.out.println("selfSign is true...");
signedData = signData(privk, pkidata);
} else {
- // none selfSign signes with existing cert
+ // none selfSign signs with existing cert
System.out.println("selfSign is false...");
signedData = signData(signerCert, tokenName, nickname, cm, pkidata);
}