Bug 288011 eliminate nsISSLSocketProvider

r=darin sr=bz

directory/xpcom/base/src/nsLDAPSecurityGlue.cpp

@@ -45,8 +45,9 @@
 
 #include "nsCOMPtr.h"
 #include "nsIServiceManager.h"
-#include "nsISSLSocketProvider.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsNetCID.h"
+#include "nsISocketProvider.h"
 #include "nsISSLSocketControl.h"
 #include "nsMemory.h"
 #include "nsLDAPInternal.h"
@@ -131,7 +132,7 @@ nsLDAPSSLConnect(const char *hostlist, int defport, int timeout,
     nsLDAPSSLSessionClosure *sessionClosure;
     int	intfd = -1;
     nsCOMPtr <nsISupports> securityInfo;
-    nsCOMPtr <nsISSLSocketProvider> tlsSocketProvider;
+    nsCOMPtr <nsISocketProvider> tlsSocketProvider;
     nsCOMPtr <nsISSLSocketControl> sslSocketControl;
     nsresult rv;
 

netwerk/build/nsNetCID.h

@@ -685,6 +685,16 @@
     { 0xa2, 0x8a, 0x5b, 0xa2, 0x44, 0x7f, 0xba, 0xce } \
 }
 
+#define NS_SSLSOCKETPROVIDER_CONTRACTID \
+    NS_NETWORK_SOCKET_CONTRACTID_PREFIX "ssl"
+
+/* This code produces a normal socket which can be used to initiate the
+ * STARTTLS protocol by calling its nsISSLSocketControl->StartTLS()
+ */
+#define NS_STARTTLSSOCKETPROVIDER_CONTRACTID \
+    NS_NETWORK_SOCKET_CONTRACTID_PREFIX "starttls"
+
+
 /******************************************************************************
  * netwerk/cookie classes
  */

netwerk/socket/base/Makefile.in

@@ -63,7 +63,6 @@ XPIDLSRCS	= \
 		nsISocketProviderService.idl \
 		nsISOCKSSocketInfo.idl \
 		nsITransportSecurityInfo.idl \
-		nsISSLSocketProvider.idl \
 		nsISSLSocketControl.idl \
 		$(NULL)
 

security/manager/ssl/src/nsNSSModule.cpp

@@ -245,9 +245,9 @@ static const nsModuleComponentInfo components[] =
   },
   
   {
-    NS_ISSLSOCKETPROVIDER_CLASSNAME,
+    NS_SSLSOCKETPROVIDER_CLASSNAME,
     NS_SSLSOCKETPROVIDER_CID,
-    NS_ISSLSOCKETPROVIDER_CONTRACTID,
+    NS_SSLSOCKETPROVIDER_CONTRACTID,
     nsSSLSocketProviderConstructor
   },
   

security/manager/ssl/src/nsSSLSocketProvider.cpp

@@ -49,8 +49,7 @@ nsSSLSocketProvider::~nsSSLSocketProvider()
 {
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsSSLSocketProvider, nsISocketProvider,
-                              nsISSLSocketProvider)
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsSSLSocketProvider, nsISocketProvider)
 
 NS_IMETHODIMP
 nsSSLSocketProvider::NewSocket(PRInt32 family,

security/manager/ssl/src/nsSSLSocketProvider.h

@@ -40,19 +40,19 @@
 #ifndef _NSSSLSOCKETPROVIDER_H_
 #define _NSSSLSOCKETPROVIDER_H_
 
-#include "nsISSLSocketProvider.h"
+#include "nsISocketProvider.h"
 
+#define NS_SSLSOCKETPROVIDER_CLASSNAME  "Mozilla SSL Socket Provider Component"
 /* 217d014a-1dd2-11b2-999c-b0c4df79b324 */
 #define NS_SSLSOCKETPROVIDER_CID   \
 { 0x217d014a, 0x1dd2, 0x11b2, {0x99, 0x9c, 0xb0, 0xc4, 0xdf, 0x79, 0xb3, 0x24}}
 
 
-class nsSSLSocketProvider : public nsISSLSocketProvider
+class nsSSLSocketProvider : public nsISocketProvider
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSISOCKETPROVIDER
-  NS_DECL_NSISSLSOCKETPROVIDER
   
   // nsSSLSocketProvider methods:
   nsSSLSocketProvider();

security/manager/ssl/src/nsTLSSocketProvider.cpp

@@ -49,8 +49,7 @@ nsTLSSocketProvider::~nsTLSSocketProvider()
 {
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsTLSSocketProvider, nsISocketProvider,
-                              nsISSLSocketProvider)
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsTLSSocketProvider, nsISocketProvider)
 
 NS_IMETHODIMP
 nsTLSSocketProvider::NewSocket(PRInt32 family,

security/manager/ssl/src/nsTLSSocketProvider.h

@@ -40,9 +40,10 @@
 #ifndef _NSTLSSOCKETPROVIDER_H_
 #define _NSTLSSOCKETPROVIDER_H_
 
-#include "nsISSLSocketProvider.h"
+#include "nsISocketProvider.h"
 
 
+#define NS_STARTTLSSOCKETPROVIDER_CLASSNAME  "Mozilla STARTTLS Capable Socket Provider Component"
 #define NS_STARTTLSSOCKETPROVIDER_CID \
 { /* b9507aec-1dd1-11b2-8cd5-c48ee0c50307 */         \
      0xb9507aec,                                     \
@@ -51,13 +52,12 @@
     {0x8c, 0xd5, 0xc4, 0x8e, 0xe0, 0xc5, 0x03, 0x07} \
 }
 
-class nsTLSSocketProvider : public nsISSLSocketProvider
+class nsTLSSocketProvider : public nsISocketProvider
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSISOCKETPROVIDER
-  NS_DECL_NSISSLSOCKETPROVIDER
-  
+
   // nsTLSSocketProvider methods:
   nsTLSSocketProvider();
   virtual ~nsTLSSocketProvider();