From 9d70b938b921b40d2592bd7e3fafdc0e914c0a32 Mon Sep 17 00:00:00 2001 From: Christina Fu Date: Sun, 1 Sep 2013 16:55:06 -0700 Subject: Bug 986831 - Some tools are broken for ECC with NSS token alone --- base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java | 2 +- base/java-tools/src/com/netscape/cmstools/PKCS10Client.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'base/java-tools/src') diff --git a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java index 016adb861..ec152f775 100644 --- a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java +++ b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java @@ -324,7 +324,7 @@ public class CRMFPopClient { CryptoToken token = null; if (TOKEN_NAME == null) { token = manager.getInternalKeyStorageToken(); - TOKEN_NAME = "NSS Certificate DB"; + TOKEN_NAME = token.getName(); } else { token = manager.getTokenByName(TOKEN_NAME); } diff --git a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java index b432c7d1a..d1c787efb 100644 --- a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java +++ b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java @@ -200,11 +200,13 @@ public class PKCS10Client { CryptoManager cm = CryptoManager.getInstance(); if ((tokenName == null) || (tokenName.equals(""))) { token = cm.getInternalKeyStorageToken(); - tokenName = "NSS Certificate DB"; + tokenName = token.getName(); } else { token = cm.getTokenByName(tokenName); } + System.out.println("PKCS10Client: Debug: got token."); cm.setThreadToken(token); + System.out.println("PKCS10Client: Debug: thread token set."); Password pass = new Password(password.toCharArray()); -- cgit