b=102633 Changed cipher prefs dialog.

Allow the user to enable additional ciphers.
Disable two cipher suites that are no longer in use (said the NSS team).
r=javi/nelsonb/cotter sr=alecf


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

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

@@ -46,6 +46,7 @@
 #include "nsCertPicker.h"
 #include "nsCURILoader.h"
 #include "nsICategoryManager.h"
+#include "nsCipherInfo.h"
 
 // We must ensure that the nsNSSComponent has been loaded before
 // creating any other components.
@@ -155,6 +156,7 @@ NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(PR_FALSE, nsCMSEncoder)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(PR_FALSE, nsCMSMessage)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(PR_FALSE, nsHash)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(PR_FALSE, nsCertPicker)
+NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(PR_FALSE, nsCipherInfoService)
 
 static NS_METHOD RegisterPSMContentListeners(
                       nsIComponentManager *aCompMgr,
@@ -347,6 +349,13 @@ static const nsModuleComponentInfo components[] =
     "@mozilla.org/uriloader/psm-external-content-listener;1",
     PSMContentListenerConstructor,
     RegisterPSMContentListeners
+  },
+  
+  {
+    "PSM Cipher Info",
+    NS_CIPHERINFOSERVICE_CID,
+    NS_CIPHERINFOSERVICE_CONTRACTID,
+    nsCipherInfoServiceConstructor
   }
 };