Implement LoadTemporaryRoot for Windows

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 083aac4b434f7fee4ad11e882bb26a1ec5c523cd..ff72db1d2161309146b145e1f6f67363a252d24c 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -177,6 +177,12 @@
         'base/ssl_info.h',
         'base/static_cookie_policy.cc',
         'base/static_cookie_policy.h',
+        'base/temporary_root_certs.cc',
+        'base/temporary_root_certs.h',
+        'base/temporary_root_certs_mac.cc',
+        'base/temporary_root_certs_nss.cc',
+        'base/temporary_root_certs_openssl.cc',
+        'base/temporary_root_certs_win.cc',
         'base/transport_security_state.cc',
         'base/transport_security_state.h',
         'base/sys_addrinfo.h',
@@ -252,6 +258,7 @@
             'sources!': [
               'base/cert_database_nss.cc',
               'base/keygen_handler_nss.cc',
+              'base/temporary_root_certs_nss.cc',
               'base/x509_certificate_nss.cc',
               'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
               'third_party/mozilla_security_manager/nsKeygenHandler.h',
@@ -272,6 +279,7 @@
               'base/keygen_handler_nss.cc',
               'base/nss_memio.c',
               'base/nss_memio.h',
+              'base/temporary_root_certs_nss.cc',
               'base/x509_certificate_nss.cc',
               'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
               'third_party/mozilla_security_manager/nsKeygenHandler.h',
@@ -289,6 +297,7 @@
               'base/keygen_handler_openssl.cc',
               'base/openssl_util.cc',
               'base/openssl_util.h',
+              'base/temporary_root_certs_openssl.cc',
               'base/x509_certificate_openssl.cc',
               'base/x509_openssl_util.cc',
               'base/x509_openssl_util.h',
@@ -722,6 +731,8 @@
         }],
         ['use_openssl==1', {
             'sources!': [
+              'ocsp/nss_ocsp.cc',

[wtc, 2010/11/16 23:24:01]

Is this a merge error?  This change doesn't belong in this
changelist.

[Ryan Sleevi, 2010/11/17 09:37:43]

See message #1. It was a necessary change to get this patchset to compile with
use_openssl=1. I just used this CL to flag the initial issue, since they had
expressed comments/concerns related to some of the other stuff. joth landed this
change (along with several other openssl compile fixes), so it's no longer part
of this patchset.

+              'ocsp/nss_ocsp.h',
               'socket/dns_cert_provenance_check.cc',
               'socket/dns_cert_provenance_check.h',
               'socket/ssl_client_socket_nss.cc',
@@ -1153,8 +1164,6 @@
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
-        'base/cert_test_util.cc',
-        'base/cert_test_util.h',
         'disk_cache/disk_cache_test_util.cc',
         'disk_cache/disk_cache_test_util.h',
         'proxy/proxy_config_service_common_unittest.cc',
@@ -1180,7 +1189,7 @@
             ['use_openssl==1', {
               'dependencies': [
                 '../build/linux/system.gyp:openssl',
-              ]
+              ],
             }, {
               'dependencies': [
                 '../build/linux/system.gyp:nss',