Bug 1253166 - Remove UI to override RC4 errors. r=keeler
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Tue, 08 Mar 2016 06:34:42 +0900
changeset 338008 52007f2cba341367f30533da5b0e1172cfa1daf8
parent 338007 b5621f52feab3069643eaa78499fbcdc8cafc468
child 338009 42356eefad43dc866381ae63c1297fc0069a8c3a
push id12405
push usercku@mozilla.com
push dateTue, 08 Mar 2016 03:35:29 +0000
reviewerskeeler
bugs1253166
milestone47.0a1
Bug 1253166 - Remove UI to override RC4 errors. r=keeler
security/manager/ssl/nsNSSIOLayer.cpp
--- a/security/manager/ssl/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/nsNSSIOLayer.cpp
@@ -1114,21 +1114,16 @@ retryDueToTLSIntolerance(PRErrorCode err
     if (!fallbackLimitReached || helpers.mUnrestrictedRC4Fallback) {
       if (helpers.rememberStrongCiphersFailed(socketInfo->GetHostName(),
                                               socketInfo->GetPort(), err)) {
         Telemetry::Accumulate(Telemetry::SSL_WEAK_CIPHERS_FALLBACK,
                               tlsIntoleranceTelemetryBucket(err));
         return true;
       }
       Telemetry::Accumulate(Telemetry::SSL_WEAK_CIPHERS_FALLBACK, 0);
-    } else if (err == SSL_ERROR_NO_CYPHER_OVERLAP) {
-      // Indicate that the override UI should be shown.
-      socketInfo->SetSecurityState(
-        nsIWebProgressListener::STATE_IS_INSECURE |
-        nsIWebProgressListener::STATE_USES_WEAK_CRYPTO);
     }
   }
 
   // When not using a proxy we'll see a connection reset error.
   // When using a proxy, we'll see an end of file error.
 
   // Don't allow STARTTLS connections to fall back on connection resets or
   // EOF.