Reorganize password callback context (uses nsIInterfaceRequestor).

Fix several bugs in the SDR implementation.


git-svn-id: svn://10.0.0.236/trunk@85834 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/security/manager/ssl/src/nsNSSModule.cpp

@@ -33,10 +33,20 @@
 
 #include "nsCURILoader.h"
 
+#include "nsSDR.h"
+
+#ifdef USE_NSCERTIFICATEDB
+#include "nsCertificateDB.h"
+#endif
+
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNSSComponent, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSecureBrowserUIImpl)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSSLSocketProvider)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsTLSSocketProvider)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsSecretDecoderRing)
+#ifdef USE_NSCERTIFICATEDB
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsCertificateDB)
+#endif
 
 static nsModuleComponentInfo components[] =
 {
@@ -110,6 +120,22 @@ static nsModuleComponentInfo components[] =
     nsSSLSocketProviderConstructor
   },
 
+  {
+    NS_SDR_CLASSNAME,
+    NS_SDR_CID,
+    NS_SDR_CONTRACTID,
+    nsSecretDecoderRingConstructor
+  },
+
+#ifdef USE_NSCERTIFICATEDB
+  {
+    "Certificate Database",
+    NS_CERTIFICATEDB_CID,
+    NS_CERTIFICATEDB_CONTRACTID,
+    nsCertificateDBConstructor
+  },
+#endif
+
   {
     "Entropy Collector",
     NS_ENTROPYCOLLECTOR_CID,