From 16cb19be8a4514ac45f5f0ff482857a78c15771e Mon Sep 17 00:00:00 2001 From: gkapoor Date: Sun, 23 Jun 2019 02:15:07 +0530 Subject: [PATCH 1/2] Modified HttpClient.java to pick token details correctly if admin/agent certificates reside in HSM Signed-off-by: gkapoor --- base/java-tools/src/com/netscape/cmstools/HttpClient.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/base/java-tools/src/com/netscape/cmstools/HttpClient.java b/base/java-tools/src/com/netscape/cmstools/HttpClient.java index 28934ab553a..dd3918eff92 100644 --- a/base/java-tools/src/com/netscape/cmstools/HttpClient.java +++ b/base/java-tools/src/com/netscape/cmstools/HttpClient.java @@ -143,6 +143,7 @@ public void send(String ifilename, String ofilename, String tokenName, String db certname.append(":"); } certname.append(nickname); + System.out.println("Certificate Nickname:" + " " + certname); X509Certificate cert = cm.findCertByNickname(certname.toString()); @@ -152,7 +153,8 @@ public void send(String ifilename, String ofilename, String tokenName, String db else System.out.println("client cert is not null"); sslSocket.setUseClientMode(true); - sslSocket.setClientCertNickname(nickname); + String certnick = certname.toString(); + sslSocket.setClientCertNickname(certnick); } sslSocket.forceHandshake(); From f0f593ec26957dee2a41517dadf2d1be2440b4b8 Mon Sep 17 00:00:00 2001 From: gkapoor Date: Thu, 27 Jun 2019 17:49:43 +0530 Subject: [PATCH 2/2] Updating Httpclient to pick admin/agent certificates from HSM Signed-off-by: gkapoor --- base/java-tools/src/com/netscape/cmstools/HttpClient.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/base/java-tools/src/com/netscape/cmstools/HttpClient.java b/base/java-tools/src/com/netscape/cmstools/HttpClient.java index dd3918eff92..eb21e760752 100644 --- a/base/java-tools/src/com/netscape/cmstools/HttpClient.java +++ b/base/java-tools/src/com/netscape/cmstools/HttpClient.java @@ -144,16 +144,15 @@ public void send(String ifilename, String ofilename, String tokenName, String db } certname.append(nickname); System.out.println("Certificate Nickname:" + " " + certname); - + String certnick = certname.toString(); X509Certificate cert = - cm.findCertByNickname(certname.toString()); + cm.findCertByNickname(certnick); if (cert == null) System.out.println("client cert is null"); else System.out.println("client cert is not null"); sslSocket.setUseClientMode(true); - String certnick = certname.toString(); sslSocket.setClientCertNickname(certnick); }