tor-browser

commit 462081402973a1bca9e443ad10f4f5fcba380fe7
parent 43c842afe992b57d7ea00fe546d39f1ad2ef42a9
Author: Mike Perry <mikeperry-git@torproject.org>
Date:   Wed, 27 Aug 2014 15:19:10 -0700

BB 12974: Disable NTLM and Negotiate HTTP Auth

The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421,
https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602

Diffstat:
M
extensions/auth/nsHttpNegotiateAuth.cpp
 | 
4
++++
M
netwerk/protocol/http/nsHttpNTLMAuth.cpp
 | 
3
+++

2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/extensions/auth/nsHttpNegotiateAuth.cpp b/extensions/auth/nsHttpNegotiateAuth.cpp
@@ -144,6 +144,10 @@ nsHttpNegotiateAuth::ChallengeReceived(nsIHttpAuthenticableChannel* authChannel,
   nsIAuthModule* rawModule = (nsIAuthModule*)*continuationState;
 
   *identityInvalid = false;
+
+  /* Always fail Negotiate auth for Tor Browser. We don't need it. */
+  return NS_ERROR_ABORT;
+
   if (rawModule) {
     return NS_OK;
   }
diff --git a/netwerk/protocol/http/nsHttpNTLMAuth.cpp b/netwerk/protocol/http/nsHttpNTLMAuth.cpp
@@ -164,6 +164,9 @@ nsHttpNTLMAuth::ChallengeReceived(nsIHttpAuthenticableChannel* channel,
 
   *identityInvalid = false;
 
+  /* Always fail Negotiate auth for Tor Browser. We don't need it. */
+  return NS_ERROR_ABORT;
+
   // Start a new auth sequence if the challenge is exactly "NTLM".
   // If native NTLM auth apis are available and enabled through prefs,
   // try to use them.