Implement LoadTemporaryRoot for Windows

net/net.gyp

 # Copyright (c) 2010 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 159 matching lines @@
         'base/ssl_config_service_defaults.h',
         'base/ssl_config_service_mac.cc',
         'base/ssl_config_service_mac.h',
         'base/ssl_config_service_win.cc',
         'base/ssl_config_service_win.h',
         'base/ssl_false_start_blacklist.cc',
         'base/ssl_info.cc',
         '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',
         'base/test_completion_callback.h',
         'base/upload_data.cc',
         'base/upload_data.h',
         'base/upload_data_stream.cc',
         'base/upload_data_stream.h',
         'base/winsock_init.cc',
         'base/winsock_init.h',
@@ skipping 55 matching lines @@
                 'dependencies': [
                   '../build/linux/system.gyp:nss',
                 ],
               }],
             ],
           },
           {  # else: OS is not in the above list
             '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',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
               'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
               'third_party/mozilla_security_manager/nsNSSCertTrust.h',
               'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
               'third_party/mozilla_security_manager/nsPKCS12Blob.h',
             ],
           },
         ],
         [ 'use_openssl==1', {
             'sources!': [
               'base/cert_database_nss.cc',
               'base/dnssec_keyset.cc',
               'base/dnssec_keyset.h',
               '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',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
               'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
               'third_party/mozilla_security_manager/nsNSSCertTrust.h',
               'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
               'third_party/mozilla_security_manager/nsPKCS12Blob.h',
             ],
           },
           {  # else: not using openssl.
             'sources!': [
               'base/cert_database_openssl.cc',
               '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',
              ],
           },
         ],
         [ 'OS == "win"', {
             'dependencies': [
               '../third_party/nss/nss.gyp:nss',
               'tld_cleanup',
@@ skipping 413 matching lines @@
           ],
         }],
         ['chromeos==1', {
           'sources!': [
              'proxy/proxy_config_service_linux.cc',
              'proxy/proxy_config_service_linux.h',
           ],
         }],
         ['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',
               'socket/ssl_client_socket_nss.h',
               'socket/ssl_client_socket_nss_factory.cc',
               'socket/ssl_client_socket_nss_factory.h',
             ],
           },
           {  # else !use_openssl: remove the unneeded files
             'sources!': [
@@ skipping 411 matching lines @@
     {
       'target_name': 'net_test_support',
       'type': '<(library)',
       'dependencies': [
         'net',
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../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',
         'proxy/proxy_config_service_common_unittest.h',
         'socket/socket_test_util.cc',
         'socket/socket_test_util.h',
         'test/python_utils.cc',
         'test/python_utils.h',
         'test/test_server.cc',
         'test/test_server_posix.cc',
         'test/test_server_win.cc',
         'test/test_server.h',
       ],
       'conditions': [
         ['inside_chromium_build==1', {
           'dependencies': [
             '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto',
             '../third_party/protobuf/protobuf.gyp:py_proto',
           ],
         }],
         ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
           'conditions': [
             ['use_openssl==1', {
               'dependencies': [
                 '../build/linux/system.gyp:openssl',
-              ]
+              ],
             }, {
               'dependencies': [
                 '../build/linux/system.gyp:nss',
               ],
             }],
           ],
         }],
         ['OS == "linux"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
@@ skipping 212 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: