remove calls to deprecated CryptoManager.initialize(secmoddb, certdb, keydb);

This commit is contained in:
nicolson%netscape.com 2001-07-06 01:18:36 +00:00
parent dc7aa55f2c
commit bcf02f1d15
13 changed files with 14 additions and 27 deletions

View File

@ -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

View File

@ -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();

View File

@ -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

View File

@ -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 {

View File

@ -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");

View File

@ -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();

View File

@ -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

View File

@ -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();

View File

@ -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();

View File

@ -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();

View File

@ -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();

View File

@ -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;

View File

@ -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);