[tor-commits] [tor-browser] 06/66: Bug 12974: Disable NTLM and Negotiate HTTP Auth

[gitolite role]

This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch tor-browser-102.2.0esr-12.0-2
in repository tor-browser.

commit 316c840c0842a43fa020f1cb8928a2fefc483913
Author: Mike Perry <mikeperry-git at torproject.org>
AuthorDate: Wed Aug 27 15:19:10 2014 -0700

    Bug 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
---
 extensions/auth/nsHttpNegotiateAuth.cpp  | 4 ++++
 netwerk/protocol/http/nsHttpNTLMAuth.cpp | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/extensions/auth/nsHttpNegotiateAuth.cpp b/extensions/auth/nsHttpNegotiateAuth.cpp
index fedf40026e1be..f7d22c41ffbb0 100644
--- a/extensions/auth/nsHttpNegotiateAuth.cpp
+++ b/extensions/auth/nsHttpNegotiateAuth.cpp
@@ -156,6 +156,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
index 30de77d7ca192..6e0645a24c1fc 100644
--- a/netwerk/protocol/http/nsHttpNTLMAuth.cpp
+++ b/netwerk/protocol/http/nsHttpNTLMAuth.cpp
@@ -170,6 +170,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.

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.