diff options
Diffstat (limited to 'base/silent/src/com/netscape/pkisilent/common')
3 files changed, 5 insertions, 7 deletions
diff --git a/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java b/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java index 482e2ffab..d1941ca30 100644 --- a/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java +++ b/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java @@ -44,7 +44,6 @@ import org.mozilla.jss.crypto.KeyWrapper; import org.mozilla.jss.crypto.PrivateKey; import org.mozilla.jss.crypto.SymmetricKey; import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.pkcs11.PK11Token; import org.mozilla.jss.pkix.crmf.CertReqMsg; import org.mozilla.jss.pkix.crmf.CertRequest; import org.mozilla.jss.pkix.crmf.CertTemplate; @@ -371,7 +370,7 @@ public class ComCrypto { keys = store.getPrivateKeys(); for (i = 0; i < keys.length; i++) { - PrivateKey key = (PrivateKey) keys[i]; + PrivateKey key = keys[i]; store.deletePrivateKey(key); } @@ -414,7 +413,7 @@ public class ComCrypto { } manager = CryptoManager.getInstance(); - token = (PK11Token) manager.getInternalKeyStorageToken(); + token = manager.getInternalKeyStorageToken(); pass1 = new Password(tokenpwd.toCharArray()); if (token.isLoggedIn() && debug) { System.out.println("Already Logged in "); diff --git a/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java b/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java index bc419fb02..bfaf1eb34 100644 --- a/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java +++ b/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java @@ -29,7 +29,6 @@ import org.mozilla.jss.CryptoManager; import org.mozilla.jss.crypto.AlreadyInitializedException; import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.pkcs11.PK11Token; import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; import org.mozilla.jss.ssl.SSLClientCertificateSelectionCallback; import org.mozilla.jss.ssl.SSLSocket; @@ -233,7 +232,7 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, System.out.println("Step 2: Login to Cert Database"); manager = CryptoManager.getInstance(); - CryptoToken token = (PK11Token) manager.getInternalKeyStorageToken(); + CryptoToken token = manager.getInternalKeyStorageToken(); if (token.isLoggedIn()) { System.out.println("Con2Agent: Logged in incorrect"); @@ -244,7 +243,7 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, tokenpwd.getChars(0, tokenpwd.length(), passchar1, 0); - pass1 = new Password((char[]) passchar1.clone()); + pass1 = new Password(passchar1.clone()); token.login(pass1); X509Certificate cert2 = manager.findCertByNickname(certnickname); diff --git a/base/silent/src/com/netscape/pkisilent/common/PostQuery.java b/base/silent/src/com/netscape/pkisilent/common/PostQuery.java index 27c9209e8..b7399336f 100644 --- a/base/silent/src/com/netscape/pkisilent/common/PostQuery.java +++ b/base/silent/src/com/netscape/pkisilent/common/PostQuery.java @@ -111,7 +111,7 @@ public class PostQuery { os.flush(); os.close(); - InputStream Content = (InputStream) URLCon.getInputStream(); + InputStream Content = URLCon.getInputStream(); System.out.println("Configuring Cert Instance : Return Response"); BufferedReader in = new BufferedReader( |