From 102e92fd04977d92b118e62eda5f9a048aede8f0 Mon Sep 17 00:00:00 2001 From: "nicolson%netscape.com" Date: Fri, 6 Jul 2001 01:18:36 +0000 Subject: [PATCH] remove calls to deprecated CryptoManager.initialize(secmoddb, certdb, keydb); git-svn-id: svn://10.0.0.236/trunk@98753 18797224-902f-48f8-a5cc-f745e15eee43 --- .../jss/org/mozilla/jss/pkcs10/CertificationRequest.java | 3 +-- mozilla/security/jss/org/mozilla/jss/pkcs12/PFX.java | 3 +-- .../security/jss/org/mozilla/jss/pkix/cert/Certificate.java | 3 +-- mozilla/security/jss/org/mozilla/jss/ssl/SSLClient.java | 5 ++--- mozilla/security/jss/org/mozilla/jss/ssl/SSLServer.java | 2 +- mozilla/security/jss/org/mozilla/jss/tests/CloseDBs.java | 4 +--- mozilla/security/jss/org/mozilla/jss/tests/DigestTest.java | 3 +-- mozilla/security/jss/org/mozilla/jss/tests/JCASigTest.java | 5 +---- mozilla/security/jss/org/mozilla/jss/tests/ListCerts.java | 3 +-- mozilla/security/jss/org/mozilla/jss/tests/PK10Gen.java | 2 +- mozilla/security/jss/org/mozilla/jss/tests/SelfTest.java | 4 +--- mozilla/security/jss/org/mozilla/jss/tests/SymKeyGen.java | 2 +- mozilla/security/jss/org/mozilla/jss/tests/socketTest.java | 2 +- 13 files changed, 14 insertions(+), 27 deletions(-) diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs10/CertificationRequest.java b/mozilla/security/jss/org/mozilla/jss/pkcs10/CertificationRequest.java index 492f0f803f7..4b67004f308 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkcs10/CertificationRequest.java +++ b/mozilla/security/jss/org/mozilla/jss/pkcs10/CertificationRequest.java @@ -275,8 +275,7 @@ public class CertificationRequest implements ASN1Value { System.exit(0); } - CryptoManager.initialize( argv[0]+"/secmod.db", argv[0]+"/key3.db", - argv[0]+"/cert7.db"); + CryptoManager.initialize( argv[0] ); CryptoManager cm = CryptoManager.getInstance(); // read in a cert diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs12/PFX.java b/mozilla/security/jss/org/mozilla/jss/pkcs12/PFX.java index 1e86d0f8995..9462be68514 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkcs12/PFX.java +++ b/mozilla/security/jss/org/mozilla/jss/pkcs12/PFX.java @@ -337,8 +337,7 @@ public class PFX implements ASN1Value { FileInputStream fis = new FileInputStream(args[1]); int certfile = 0; - CryptoManager.initialize( args[0]+"secmod.db", - args[0]+"key3.db", args[0]+"cert7.db"); + CryptoManager.initialize( args[0] ); // Decode the P12 file PFX.Template pfxt = new PFX.Template(); diff --git a/mozilla/security/jss/org/mozilla/jss/pkix/cert/Certificate.java b/mozilla/security/jss/org/mozilla/jss/pkix/cert/Certificate.java index a97f460b1e8..e2e5979e453 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkix/cert/Certificate.java +++ b/mozilla/security/jss/org/mozilla/jss/pkix/cert/Certificate.java @@ -276,8 +276,7 @@ public class Certificate implements ASN1Value { System.exit(0); } - CryptoManager.initialize( argv[0]+"/secmod.db", argv[0]+"/key3.db", - argv[0]+"/cert7.db"); + CryptoManager.initialize( argv[0] ); CryptoManager cm = CryptoManager.getInstance(); // read in a cert diff --git a/mozilla/security/jss/org/mozilla/jss/ssl/SSLClient.java b/mozilla/security/jss/org/mozilla/jss/ssl/SSLClient.java index ada7bf88b68..27d43af1fed 100644 --- a/mozilla/security/jss/org/mozilla/jss/ssl/SSLClient.java +++ b/mozilla/security/jss/org/mozilla/jss/ssl/SSLClient.java @@ -144,7 +144,7 @@ public class SSLClient results.println(htmlHeader); results.println("SSL Client Tester"); results.println( - "$Id: SSLClient.java,v 1.2 2001-02-09 11:26:09 nicolson%netscape.com Exp $ " + + "$Id: SSLClient.java,v 1.3 2001-07-06 01:18:30 nicolson%netscape.com Exp $ " + versionStr ); SSLSocket s; @@ -406,8 +406,7 @@ public class SSLClient try { CryptoManager.InitializationValues vals = - new CryptoManager.InitializationValues - ("secmod.db", "key3.db", "cert7.db"); + new CryptoManager.InitializationValues("."); CryptoManager.initialize(vals); try { diff --git a/mozilla/security/jss/org/mozilla/jss/ssl/SSLServer.java b/mozilla/security/jss/org/mozilla/jss/ssl/SSLServer.java index de07459a842..cb3e2ddcead 100644 --- a/mozilla/security/jss/org/mozilla/jss/ssl/SSLServer.java +++ b/mozilla/security/jss/org/mozilla/jss/ssl/SSLServer.java @@ -330,7 +330,7 @@ public class SSLServer System.out.println("SSLServer started\n"); try { - CryptoManager.initialize("secmod.db", "key3.db", "cert7.db"); + CryptoManager.initialize("."); } catch (KeyDatabaseException kdbe) { System.out.println("Couldn't open the key database\n"); diff --git a/mozilla/security/jss/org/mozilla/jss/tests/CloseDBs.java b/mozilla/security/jss/org/mozilla/jss/tests/CloseDBs.java index 35a323d7a8a..6af5db9b5b5 100644 --- a/mozilla/security/jss/org/mozilla/jss/tests/CloseDBs.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/CloseDBs.java @@ -51,9 +51,7 @@ public final class CloseDBs extends org.mozilla.jss.DatabaseCloser { System.exit(0); } - CryptoManager.initialize( args[0] +"/secmod.db", - args[0] +"/key3.db", - args[0] +"/cert7.db" ); + CryptoManager.initialize( args[0] ); CryptoManager manager = CryptoManager.getInstance(); diff --git a/mozilla/security/jss/org/mozilla/jss/tests/DigestTest.java b/mozilla/security/jss/org/mozilla/jss/tests/DigestTest.java index 2a128374f3d..d9c2371f6cf 100644 --- a/mozilla/security/jss/org/mozilla/jss/tests/DigestTest.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/DigestTest.java @@ -58,8 +58,7 @@ public class DigestTest { byte[] nsdigestOut; byte[] sundigestOut; - CryptoManager.initialize(dbdir+"/secmod.db", dbdir+"/key3.db", - dbdir+"/cert7.db"); + CryptoManager.initialize(dbdir); ///////////////////////////////////////////////////////////// // Install SUN provider diff --git a/mozilla/security/jss/org/mozilla/jss/tests/JCASigTest.java b/mozilla/security/jss/org/mozilla/jss/tests/JCASigTest.java index 144c0d2f5b7..0790b9280a1 100644 --- a/mozilla/security/jss/org/mozilla/jss/tests/JCASigTest.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/JCASigTest.java @@ -67,10 +67,7 @@ public class JCASigTest { try { CryptoManager.InitializationValues vals = new - CryptoManager.InitializationValues - ( args[0]+"/secmod.db", - args[0]+"/key3.db", - args[0]+"/cert7.db" ); + CryptoManager.InitializationValues ( args[0] ); CryptoManager.initialize(vals); manager = CryptoManager.getInstance(); diff --git a/mozilla/security/jss/org/mozilla/jss/tests/ListCerts.java b/mozilla/security/jss/org/mozilla/jss/tests/ListCerts.java index 2a0b0b84f1f..8170d0c0d58 100644 --- a/mozilla/security/jss/org/mozilla/jss/tests/ListCerts.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/ListCerts.java @@ -47,8 +47,7 @@ public class ListCerts { String dbdir = args[0]; String nickname = args[1]; - CryptoManager.initialize(dbdir+"/secmod.db", dbdir+"/key3.db", - dbdir+"/cert7.db"); + CryptoManager.initialize(dbdir); CryptoManager cm = CryptoManager.getInstance(); diff --git a/mozilla/security/jss/org/mozilla/jss/tests/PK10Gen.java b/mozilla/security/jss/org/mozilla/jss/tests/PK10Gen.java index e40f8ac3f2c..fc800862377 100644 --- a/mozilla/security/jss/org/mozilla/jss/tests/PK10Gen.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/PK10Gen.java @@ -52,7 +52,7 @@ public class PK10Gen { } try { - CryptoManager.initialize(args[0]+"/secmod.db", args[0]+"/key3.db", args[0]+"/cert7.db"); + CryptoManager.initialize(args[0]); /* CryptoManager.initialize("secmod.db", "key3.db", "cert7.db"); CryptoManager cm = CryptoManager.getInstance(); diff --git a/mozilla/security/jss/org/mozilla/jss/tests/SelfTest.java b/mozilla/security/jss/org/mozilla/jss/tests/SelfTest.java index 44186deda36..c305551a9ea 100644 --- a/mozilla/security/jss/org/mozilla/jss/tests/SelfTest.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/SelfTest.java @@ -61,9 +61,7 @@ public class SelfTest { } CryptoManager.InitializationValues vals = new - CryptoManager.InitializationValues( args[0]+"/secmodule.db", - args[0]+"/key3.db", - args[0]+"/cert7.db"); + CryptoManager.InitializationValues( args[0] ); CryptoManager.initialize(vals); try { manager = CryptoManager.getInstance(); diff --git a/mozilla/security/jss/org/mozilla/jss/tests/SymKeyGen.java b/mozilla/security/jss/org/mozilla/jss/tests/SymKeyGen.java index 7cc95a575ed..b445eacbd9e 100644 --- a/mozilla/security/jss/org/mozilla/jss/tests/SymKeyGen.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/SymKeyGen.java @@ -45,7 +45,7 @@ public class SymKeyGen { try { - CryptoManager.initialize("secmod.db", "key3.db", "cert7.db"); + CryptoManager.initialize("."); CryptoManager cm = CryptoManager.getInstance(); CryptoToken token = cm.getInternalCryptoToken(); byte[] keyData; diff --git a/mozilla/security/jss/org/mozilla/jss/tests/socketTest.java b/mozilla/security/jss/org/mozilla/jss/tests/socketTest.java index a14e8ae40be..9663d991898 100644 --- a/mozilla/security/jss/org/mozilla/jss/tests/socketTest.java +++ b/mozilla/security/jss/org/mozilla/jss/tests/socketTest.java @@ -40,7 +40,7 @@ public class socketTest { try { // initialize CryptoManager. - CryptoManager.initialize("secmod.db", "key3.db", "cert7.db"); + CryptoManager.initialize("."); SSLSocket sslSocket = new SSLSocket("www.verisign.com", 443);