rename tls sockets to starttls: bug 74387 r=javi r=darin sr=mscott

mailnews/compose/src/nsSmtpProtocol.cpp

@@ -359,7 +359,7 @@ void nsSmtpProtocol::Initialize(nsIURI * aURL)
         smtpUrl->GetNotificationCallbacks(getter_AddRefs(callbacks));
 
     if (m_prefTrySSL != PREF_SSL_NEVER) {
-        rv = OpenNetworkSocket(aURL, "tls", callbacks);
+        rv = OpenNetworkSocket(aURL, "tlsstepup", callbacks);
         if (NS_FAILED(rv) && m_prefTrySSL == PREF_SSL_TRY) {
             m_prefTrySSL = PREF_SSL_NEVER;
             rv = OpenNetworkSocket(aURL, nsnull, callbacks);

netwerk/base/src/nsSocketTransport.cpp

@@ -714,9 +714,9 @@ nsresult nsSocketTransport::doConnection(PRInt16 aSelectFlags)
               
                 if (!NS_SUCCEEDED(rv) || !mSocketFD) break;
 
-                // if the service was ssl or tls, we want to hold onto the socket info
+                // if the service was ssl or tlsstepup, we want to hold onto the socket info
                 if (nsCRT::strcmp(mSocketTypes[type], "ssl") == 0 ||
-                    nsCRT::strcmp(mSocketTypes[type], "tls") == 0) {
+                    nsCRT::strcmp(mSocketTypes[type], "tlsstepup") == 0) {
                     mSecurityInfo = socketInfo;
                     nsCOMPtr<nsITransportSecurityInfo> secInfo(do_QueryInterface(mSecurityInfo));
                     if (secInfo)

netwerk/socket/base/nsISSLSocketProvider.idl

@@ -32,12 +32,14 @@ interface nsISSLSocketProvider : nsISocketProvider {
 #define NS_ISSLSOCKETPROVIDER_CONTRACTID     NS_NETWORK_SOCKET_CONTRACTID_PREFIX "ssl"
 #define NS_ISSLSOCKETPROVIDER_CLASSNAME  "Mozilla SSL Socket Provider Component"
 
-/* this code behaves just like the above, but has to force a handshake */
+/* This code behaves just like the above, but works around bug 66706 */
 #define NS_ISSLFHSOCKETPROVIDER_CONTRACTID     NS_NETWORK_SOCKET_CONTRACTID_PREFIX "ssl-forcehandshake"
 #define NS_ISSLFHSOCKETPROVIDER_CLASSNAME  "Mozilla SSL-FH Socket Provider Component"
 
-/* this code behaves just like the above, but has to force a handshake */
-#define NS_TLSSOCKETPROVIDER_CONTRACTID     NS_NETWORK_SOCKET_CONTRACTID_PREFIX "tls"
-#define NS_TLSSOCKETPROVIDER_CLASSNAME  "Mozilla TLS Socket Provider Component"
+/* This code produces a normal socket which can be stepped up to TLS by
+ * calling its nsISSLSocketControl->TLSStepUp()
+ */
+#define NS_TLSSTEPUPSOCKETPROVIDER_CONTRACTID     NS_NETWORK_SOCKET_CONTRACTID_PREFIX "tlsstepup"
+#define NS_TLSSTEPUPSOCKETPROVIDER_CLASSNAME  "Mozilla TLS Step-up Socket Provider Component"
 
 %}

security/manager/ssl/src/nsNSSModule.cpp

@@ -99,9 +99,9 @@ static nsModuleComponentInfo components[] =
   },
   
   {
-    NS_TLSSOCKETPROVIDER_CLASSNAME,
-    NS_TLSSOCKETPROVIDER_CID,
-    NS_TLSSOCKETPROVIDER_CONTRACTID,
+    NS_TLSSTEPUPSOCKETPROVIDER_CLASSNAME,
+    NS_TLSSTEPUPSOCKETPROVIDER_CID,
+    NS_TLSSTEPUPSOCKETPROVIDER_CONTRACTID,
     nsTLSSocketProviderConstructor
   },
   

security/manager/ssl/src/nsTLSSocketProvider.h

@@ -27,7 +27,7 @@
 #include "nsISSLSocketProvider.h"
 
 
-#define NS_TLSSOCKETPROVIDER_CID \
+#define NS_TLSSTEPUPSOCKETPROVIDER_CID \
 { /* b9507aec-1dd1-11b2-8cd5-c48ee0c50307 */         \
      0xb9507aec,                                     \
      0x1dd1,                                         \