From 99576dcca496c59e72e32ed834e5fdad16f81d14 Mon Sep 17 00:00:00 2001
From: "nicolson%netscape.com"
 <nicolson%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 6 Jul 2001 01:08:08 +0000
Subject: [PATCH] Fix 88312: CryptoManager.initialize() causes
 nullpointerexception.

git-svn-id: svn://10.0.0.236/trunk@98750 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../org/mozilla/jss/manage/CryptoManager.java | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/mozilla/security/jss/org/mozilla/jss/manage/CryptoManager.java b/mozilla/security/jss/org/mozilla/jss/manage/CryptoManager.java
index a7fd9f042e7..cfb70a8465a 100644
--- a/mozilla/security/jss/org/mozilla/jss/manage/CryptoManager.java
+++ b/mozilla/security/jss/org/mozilla/jss/manage/CryptoManager.java
@@ -51,7 +51,7 @@ import org.mozilla.jss.CRLImportException;
  * Initialization is done with static methods, and must be done before
  * an instance can be created.  All other operations are done with instance
  * methods.
- * @version $Revision: 1.6 $ $Date: 2001-04-10 17:32:20 $ 
+ * @version $Revision: 1.7 $ $Date: 2001-07-06 01:08:08 $ 
  */
 public final class CryptoManager implements TokenSupplier
 {
@@ -114,14 +114,6 @@ public final class CryptoManager implements TokenSupplier
             this.configDir = configDir;
         }
 
-        /**
-         * deprecated
-         */
-        public InitializationValues(String secmodName, String keydbName,
-            String certdbName)
-        {
-        }
-
         public InitializationValues(String configDir, String certPrefix,
             String keyPrefix, String secmodName)
         {
@@ -737,19 +729,6 @@ public final class CryptoManager implements TokenSupplier
         initialize( new InitializationValues(configDir) );
     }
 
-    /**
-     * deprecated
-     */
-    public static synchronized void initialize( String secmodName,
-        String keydbName, String certdbName)
-        throws  KeyDatabaseException,
-                CertDatabaseException,
-                AlreadyInitializedException,
-                GeneralSecurityException
-    {
-        initialize( new InitializationValues() );
-    }
-
     /**
      * Initialize the security subsystem.  Opens the databases, loads all
      * PKCS #11 modules, initializes the internal random number generator.