diff options
Diffstat (limited to 'pki/base/util/src/com/netscape/cmsutil')
7 files changed, 20 insertions, 9 deletions
diff --git a/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java index 38b405673..c2ac547e6 100644 --- a/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java +++ b/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java @@ -1035,7 +1035,6 @@ public class CryptoUtil { */ public static void deletePrivateKey(PrivateKey prikey) throws CryptoManager.NotInitializedException, TokenException { - CryptoManager cm = CryptoManager.getInstance(); try { CryptoToken token = prikey.getOwningToken(); diff --git a/pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java b/pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java index 791549812..d0bef4b2a 100644 --- a/pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java +++ b/pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java @@ -132,7 +132,7 @@ public class JssSSLSocketFactory implements ISocketFactory { // report error if the nickName is invalid. // So we check this ourself using // findCertByNickname - X509Certificate cert = CryptoManager.getInstance().findCertByNickname(mClientAuthCertNickname); + CryptoManager.getInstance().findCertByNickname(mClientAuthCertNickname); s.setClientCertNickname(mClientAuthCertNickname); } diff --git a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordReader.java b/pki/base/util/src/com/netscape/cmsutil/password/IPasswordReader.java index 357ae0a6c..759e9e777 100644 --- a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordReader.java +++ b/pki/base/util/src/com/netscape/cmsutil/password/IPasswordReader.java @@ -25,5 +25,5 @@ public interface IPasswordReader { public String getPassword(String tag); - public Enumeration getTags(); + public Enumeration<String> getTags(); } diff --git a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordStore.java b/pki/base/util/src/com/netscape/cmsutil/password/IPasswordStore.java index f2e9293d3..49b2610fa 100644 --- a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordStore.java +++ b/pki/base/util/src/com/netscape/cmsutil/password/IPasswordStore.java @@ -25,7 +25,7 @@ public interface IPasswordStore { public String getPassword(String tag); - public Enumeration getTags(); + public Enumeration<String> getTags(); public Object putPassword(String tag, String password); diff --git a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java b/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java index 91a45ca3b..eb43607f0 100644 --- a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java +++ b/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java @@ -22,6 +22,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.Enumeration; import java.util.Properties; +import java.util.Vector; public class PlainPasswordFile implements IPasswordStore { private String mPwdPath = ""; @@ -47,8 +48,13 @@ public class PlainPasswordFile implements IPasswordStore { } // return an array of String-based tag - public Enumeration<?> getTags() { - return mPwdStore.propertyNames(); + public Enumeration<String> getTags() { + Enumeration<?> e = mPwdStore.propertyNames(); + Vector<String> v = new Vector<String>(); + while (e.hasMoreElements()) { + v.add((String) e.nextElement()); + } + return v.elements(); } public Object putPassword(String tag, String password) { diff --git a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java b/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java index 10f33350c..68724a9f6 100644 --- a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java +++ b/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java @@ -21,6 +21,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.Enumeration; import java.util.Properties; +import java.util.Vector; public class PlainPasswordReader implements IPasswordReader { private String mPwdPath = ""; @@ -46,7 +47,12 @@ public class PlainPasswordReader implements IPasswordReader { } // return an array of String-based tag - public Enumeration<?> getTags() { - return mPwdStore.propertyNames(); + public Enumeration<String> getTags() { + Enumeration<?> e = mPwdStore.propertyNames(); + Vector<String> v = new Vector<String>(); + while (e.hasMoreElements()) { + v.add((String) e.nextElement()); + } + return v.elements(); } } diff --git a/pki/base/util/src/com/netscape/cmsutil/util/Utils.java b/pki/base/util/src/com/netscape/cmsutil/util/Utils.java index 6f4ba4976..07916fb6a 100644 --- a/pki/base/util/src/com/netscape/cmsutil/util/Utils.java +++ b/pki/base/util/src/com/netscape/cmsutil/util/Utils.java @@ -145,7 +145,7 @@ public class Utils { } public static void checkHost(String hostname) throws UnknownHostException { - InetAddress addr = InetAddress.getByName(hostname); + InetAddress.getByName(hostname); } public static void copy(String orig, String dest) { |