Remove Windows XP SHA-256 and ECDSA logic.

content/browser/browser_main_runner.cc

 // Copyright (c) 2012 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.
 
 #include "content/public/browser/browser_main_runner.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "base/logging.h"
@@ skipping 16 matching lines @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "third_party/skia/include/core/SkGraphics.h"
 #include "ui/base/ime/input_method_initializer.h"
 
 #if defined(OS_ANDROID)
 #include "content/browser/android/tracing_controller_android.h"
 #endif
 
 #if defined(OS_WIN)
-#include "base/win/win_util.h"
 #include "base/win/windows_version.h"
-#include "net/cert/sha256_legacy_support_win.h"
-#include "sandbox/win/src/sidestep/preamble_patcher.h"
 #include "ui/base/win/scoped_ole_initializer.h"
-#include "ui/gfx/switches.h"
 #include "ui/gfx/win/direct_write.h"
 #endif
 
 namespace content {
 
 namespace {
 
 bool g_exited_main_message_loop = false;
 
-#if defined(OS_WIN)
-#if !defined(_WIN64)
-// Pointer to the original CryptVerifyCertificateSignatureEx function.
-net::sha256_interception::CryptVerifyCertificateSignatureExFunc
-    g_real_crypt_verify_signature_stub = NULL;
-
-// Stub function that is called whenever the Crypt32 function
-// CryptVerifyCertificateSignatureEx is called. It just defers to net to perform
-// the actual verification.
-BOOL WINAPI CryptVerifyCertificateSignatureExStub(
-    HCRYPTPROV_LEGACY provider,
-    DWORD encoding_type,
-    DWORD subject_type,
-    void* subject_data,
-    DWORD issuer_type,
-    void* issuer_data,
-    DWORD flags,
-    void* extra) {
-  return net::sha256_interception::CryptVerifyCertificateSignatureExHook(
-      g_real_crypt_verify_signature_stub, provider, encoding_type, subject_type,
-      subject_data, issuer_type, issuer_data, flags, extra);
-}
-#endif  // !defined(_WIN64)
-
-// If necessary, install an interception
-void InstallSha256LegacyHooks() {
-#if defined(_WIN64)
-  // Interception on x64 is not supported.
-  return;
-#else
-  if (base::win::MaybeHasSHA256Support())
-    return;
-
-  net::sha256_interception::CryptVerifyCertificateSignatureExFunc
-      cert_verify_signature_ptr = reinterpret_cast<
-          net::sha256_interception::CryptVerifyCertificateSignatureExFunc>(
-              ::GetProcAddress(::GetModuleHandle(L"crypt32.dll"),
-                               "CryptVerifyCertificateSignatureEx"));
-  CHECK(cert_verify_signature_ptr);
-
-  DWORD old_protect = 0;
-  if (!::VirtualProtect(cert_verify_signature_ptr, 5, PAGE_EXECUTE_READWRITE,
-                        &old_protect)) {
-    return;
-  }
-
-  g_real_crypt_verify_signature_stub =
-      reinterpret_cast<
-          net::sha256_interception::CryptVerifyCertificateSignatureExFunc>(
-              VirtualAllocEx(::GetCurrentProcess(), NULL,
-                             sidestep::kMaxPreambleStubSize, MEM_COMMIT,
-                             PAGE_EXECUTE_READWRITE));
-  if (g_real_crypt_verify_signature_stub == NULL) {
-    CHECK(::VirtualProtect(cert_verify_signature_ptr, 5, old_protect,
-                           &old_protect));
-    return;
-  }
-
-  sidestep::SideStepError patch_result =
-      sidestep::PreamblePatcher::Patch(
-          cert_verify_signature_ptr, CryptVerifyCertificateSignatureExStub,
-          g_real_crypt_verify_signature_stub, sidestep::kMaxPreambleStubSize);
-  if (patch_result != sidestep::SIDESTEP_SUCCESS) {
-    CHECK(::VirtualFreeEx(::GetCurrentProcess(),
-                          g_real_crypt_verify_signature_stub, 0,
-                          MEM_RELEASE));
-    CHECK(::VirtualProtect(cert_verify_signature_ptr, 5, old_protect,
-                           &old_protect));
-    return;
-  }
-
-  DWORD dummy = 0;
-  CHECK(::VirtualProtect(cert_verify_signature_ptr, 5, old_protect, &dummy));
-  CHECK(::VirtualProtect(g_real_crypt_verify_signature_stub,
-                         sidestep::kMaxPreambleStubSize, old_protect,
-                         &old_protect));
-#endif  // _WIN64
-}
-#endif  // OS_WIN
-
 }  // namespace
 
 class BrowserMainRunnerImpl : public BrowserMainRunner {
  public:
   BrowserMainRunnerImpl()
       : initialization_started_(false), is_shutdown_(false) {}
 
   ~BrowserMainRunnerImpl() override {
     if (initialization_started_ && !is_shutdown_)
       Shutdown();
@@ skipping 20 matching lines @@
       const base::TimeTicks start_time_step1 = base::TimeTicks::Now();
 
       SkGraphics::Init();
 
 #if !defined(OS_IOS)
       if (parameters.command_line.HasSwitch(switches::kWaitForDebugger))
         base::debug::WaitForDebugger(60, true);
 #endif
 
 #if defined(OS_WIN)
       if (base::win::GetVersion() < base::win::VERSION_VISTA) {

[Ryan Sleevi, 2016/01/21 22:43:06]

Oooh, we can delete this code too.

But not in this CL :P

[davidben, 2016/01/21 22:50:46]

Oh, didn't even notice that. I'll go upload that CL too. It'll take 5 minutes...

         // When "Extend support of advanced text services to all programs"
         // (a.k.a. Cicero Unaware Application Support; CUAS) is enabled on
         // Windows XP and handwriting modules shipped with Office 2003 are
         // installed, "penjpn.dll" and "skchui.dll" will be loaded and then
         // crash unless a user installs Office 2003 SP3. To prevent these
         // modules from being loaded, disable TSF entirely. crbug.com/160914.
         // TODO(yukawa): Add a high-level wrapper for this instead of calling
         // Win32 API here directly.
         ImmDisableTextFrameService(static_cast<DWORD>(-1));
       }
-      InstallSha256LegacyHooks();
 #endif  // OS_WIN
 
       base::StatisticsRecorder::Initialize();
 
       notification_service_.reset(new NotificationServiceImpl);
 
 #if defined(OS_WIN)
       // Ole must be initialized before starting message pump, so that TSF
       // (Text Services Framework) module can interact with the message pump
       // on Windows 8 Metro mode.
@@ skipping 138 matching lines @@
 BrowserMainRunner* BrowserMainRunner::Create() {
   return new BrowserMainRunnerImpl();
 }
 
 // static
 bool BrowserMainRunner::ExitedMainMessageLoop() {
   return g_exited_main_message_loop;
 }
 
 }  // namespace content