Replace NTLMv1 implementation with a functionally equivalent one.

net/http/http_auth_handler_ntlm.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_HTTP_HTTP_AUTH_HANDLER_NTLM_H_
 #define NET_HTTP_HTTP_AUTH_HANDLER_NTLM_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "build/build_config.h"
 
 // This contains the portable and the SSPI implementations for NTLM.
 // We use NTLM_SSPI for Windows, and NTLM_PORTABLE for other platforms.
 #if defined(OS_WIN)
 #define NTLM_SSPI
 #else
 #define NTLM_PORTABLE
 #endif
 
 #if defined(NTLM_SSPI)
 #define SECURITY_WIN32 1
 #include <windows.h>
 #include <security.h>
 #include "net/http/http_auth_sspi_win.h"
+#elif defined(NTLM_PORTABLE)
+#include "net/ntlm/ntlm_client.h"
 #endif
 
 #include <string>
 
 #include "base/strings/string16.h"
 #include "net/base/net_export.h"
 #include "net/http/http_auth_handler.h"
 #include "net/http/http_auth_handler_factory.h"
 
 namespace net {
@@ skipping 27 matching lines @@
 #endif  // defined(NTLM_SSPI)
    private:
 #if defined(NTLM_SSPI)
     ULONG max_token_length_;
     bool is_unsupported_;
     std::unique_ptr<SSPILibrary> sspi_library_;
 #endif  // defined(NTLM_SSPI)
   };
 
 #if defined(NTLM_PORTABLE)
+  static void GenerateRandom(uint8_t* output, size_t n);

[asanka, 2017/07/14 16:52:38]

This doesn't need to be a part of HttpAuthHandlerNTLM. Instead move it into an
internal namespace in the .cc file.

[zentaro, 2017/07/19 15:20:12]

Done.

+
   // A function that generates n random bytes in the output buffer.
   typedef void (*GenerateRandomProc)(uint8_t* output, size_t n);
 
   // A function that returns the local host name. Returns an empty string if
   // the local host name is not available.
   typedef std::string (*HostNameProc)();
 
   // For unit tests to override and restore the GenerateRandom and
   // GetHostName functions.
   class ScopedProcSetter {
@@ skipping 62 matching lines @@
   int GetNextToken(const void* in_token,
                    uint32_t in_token_len,
                    void** out_token,
                    uint32_t* out_token_len);
 
   // Create an NTLM SPN to identify the |origin| server.
   static std::string CreateSPN(const GURL& origin);
 
 #if defined(NTLM_SSPI)
   HttpAuthSSPI auth_sspi_;
+#elif defined(NTLM_PORTABLE)
+  ntlm::NtlmClient ntlm_client_;
 #endif
 
 #if defined(NTLM_PORTABLE)
   static GenerateRandomProc generate_random_proc_;
   static HostNameProc get_host_name_proc_;
 #endif
 
   base::string16 domain_;
   AuthCredentials credentials_;
   std::string channel_bindings_;
 
   // The base64-encoded string following "NTLM" in the "WWW-Authenticate" or
   // "Proxy-Authenticate" response header.
   std::string auth_data_;
 
 #if defined(NTLM_SSPI)
   const HttpAuthPreferences* http_auth_preferences_;
 #endif
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_HANDLER_NTLM_H_