PSM 2.0 work:

- Split nsISecureSocketInfo into nsISSLSocketControl and nsIChannelSecurityInfo.
- Incorporate lock icon fixes from psm-glue into pipnss code.
- Implement password callback for client auth in pipnss.
- Locallize the lock icon tooltip.
- Lots of code cleanup.

r=javi, jgmyers, sr=ben.


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

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

@@ -26,33 +26,17 @@
 #include "nsIModule.h"
 #include "nsIGenericFactory.h"
 
-//#include "nsPSMUICallbacks.h"
 #include "nsNSSComponent.h"
-
-#include "nsISecureBrowserUI.h"
 #include "nsSecureBrowserUIImpl.h"
-
 #include "nsSSLSocketProvider.h"
 #include "nsTLSSocketProvider.h"
 
-//#include "nsSDR.h"
-//#include "nsFSDR.h"
-//#include "nsCrypto.h"
-//#include "nsKeygenHandler.h"
-//For the NS_CRYPTO_CONTRACTID define
-#include "nsDOMCID.h"
-
 #include "nsCURILoader.h"
-#include "nsISupportsUtils.h"
 
-// Define SDR object constructor
-//static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-//static NS_DEFINE_IID(kFormProcessorCID,   NS_IFORMPROCESSOR_CID); 
-
-//NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSecretDecoderRing, init)
-//NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFSecretDecoderRing, init)
-//NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsCrypto, init)
-//NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPkcs11, init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNSSComponent, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsSecureBrowserUIImpl)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsSSLSocketProvider)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsTLSSocketProvider)
 
 static nsModuleComponentInfo components[] =
 {
@@ -60,101 +44,71 @@ static nsModuleComponentInfo components[] =
     PSM_COMPONENT_CLASSNAME,
     NS_NSSCOMPONENT_CID,
     PSM_COMPONENT_CONTRACTID,
-    nsNSSComponent::CreateNSSComponent
+    nsNSSComponentConstructor
   },
   
   {
     "NSS Content Handler - application/x-x509-ca-cert",
     NS_NSSCOMPONENT_CID,
     NS_CONTENT_HANDLER_CONTRACTID_PREFIX"application/x-x509-ca-cert",
-    nsNSSComponent::CreateNSSComponent
+    nsNSSComponentConstructor
   },
   
   {
     "NSS Content Handler - application/x-x509-server-cert",
     NS_NSSCOMPONENT_CID,
     NS_CONTENT_HANDLER_CONTRACTID_PREFIX"application/x-x509-server-cert",
-    nsNSSComponent::CreateNSSComponent
+    nsNSSComponentConstructor
   },
   
   {
     "NSS Content Handler - application/x-x509-user-cert",
     NS_NSSCOMPONENT_CID,
     NS_CONTENT_HANDLER_CONTRACTID_PREFIX"application/x-x509-user-cert",
-    nsNSSComponent::CreateNSSComponent
+    nsNSSComponentConstructor
   },
   
   {
     "NSS Content Handler - application/x-x509-email-cert",
     NS_NSSCOMPONENT_CID,
     NS_CONTENT_HANDLER_CONTRACTID_PREFIX"application/x-x509-email-cert",
-    nsNSSComponent::CreateNSSComponent
+    nsNSSComponentConstructor
   },
   
   {
     NS_SECURE_BROWSER_UI_CLASSNAME,
     NS_SECURE_BROWSER_UI_CID,
     NS_SECURE_BROWSER_UI_CONTRACTID,
-    nsSecureBrowserUIImpl::Create
+    nsSecureBrowserUIImplConstructor
   },
   
   {
     NS_SECURE_BROWSER_DOCOBSERVER_CLASSNAME,
     NS_SECURE_BROWSER_DOCOBSERVER_CID,
     NS_SECURE_BROWSER_DOCOBSERVER_CONTRACTID,
-    nsSecureBrowserUIImpl::Create
+    nsSecureBrowserUIImplConstructor
   },
   
   {
     NS_ISSLSOCKETPROVIDER_CLASSNAME,
     NS_SSLSOCKETPROVIDER_CID,
     NS_ISSLSOCKETPROVIDER_CONTRACTID,
-    nsSSLSocketProvider::Create
+    nsSSLSocketProviderConstructor
   },
   
   {
     NS_TLSSOCKETPROVIDER_CLASSNAME,
     NS_TLSSOCKETPROVIDER_CID,
     NS_TLSSOCKETPROVIDER_CONTRACTID,
-    nsTLSSocketProvider::Create
+    nsTLSSocketProviderConstructor
   },
   
   {
     NS_ISSLFHSOCKETPROVIDER_CLASSNAME,
     NS_SSLSOCKETPROVIDER_CID,
     NS_ISSLFHSOCKETPROVIDER_CONTRACTID,
-    nsSSLSocketProvider::Create
+    nsSSLSocketProviderConstructor
   },
-  
-#if 0
-  {
-    NS_SDR_CLASSNAME,
-    NS_SDR_CID,
-    NS_SDR_CONTRACTID,
-    nsSecretDecoderRingConstructor
-  },
-  
-  {
-    NS_FSDR_CLASSNAME,
-    NS_FSDR_CID,
-    NS_FSDR_CONTRACTID,
-    nsFSecretDecoderRingConstructor
-  },
-  
-  {
-    NS_CRYPTO_CLASSNAME,
-    NS_CRYPTO_CID,
-    NS_CRYPTO_CONTRACTID,
-    nsCryptoConstructor
-  },
-
-  {
-    NS_PKCS11_CLASSNAME,
-    NS_PKCS11_CID,
-    NS_PKCS11_CONTRACTID,
-    nsPkcs11Constructor
-  }
-#endif
 };
 
 NS_IMPL_NSGETMODULE("NSS", components);