Introduce USE_OPENSSL_CERTS for certificate handling.

net/net.gyp

 # Copyright 2013 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,
 
     'linux_link_kerberos%': 0,
     'use_tracing_cache_backend%': 0,
@@ skipping 1397 matching lines @@
               'socket/ssl_client_socket_nss.h',
               'socket/ssl_server_socket_nss.cc',
               'socket/ssl_server_socket_nss.h',
               '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/nsPKCS12Blob.cpp',
               'third_party/mozilla_security_manager/nsPKCS12Blob.h',
             ],
+            'dependencies': [
+              '../third_party/openssl/openssl.gyp:openssl',
+            ],
           },
           {  # else !use_openssl: remove the unneeded files
             'sources!': [
               'base/crypto_module_openssl.cc',
               'base/keygen_handler_openssl.cc',
-              'base/openssl_private_key_store.h',
-              'base/openssl_private_key_store_android.cc',
-              'base/openssl_private_key_store_memory.cc',
-              'cert/cert_database_openssl.cc',
-              'cert/cert_verify_proc_openssl.cc',
-              'cert/cert_verify_proc_openssl.h',
               'cert/ct_log_verifier_openssl.cc',
               'cert/ct_objects_extractor_openssl.cc',
               'cert/jwk_serializer_openssl.cc',
-              'cert/test_root_certs_openssl.cc',
-              'cert/x509_certificate_openssl.cc',
               'cert/x509_util_openssl.cc',
               'cert/x509_util_openssl.h',
               'quic/crypto/aead_base_decrypter_openssl.cc',
               'quic/crypto/aead_base_encrypter_openssl.cc',
               'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
               'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
               'quic/crypto/chacha20_poly1305_decrypter_openssl.cc',
               'quic/crypto/chacha20_poly1305_encrypter_openssl.cc',
               'quic/crypto/channel_id_openssl.cc',
               'quic/crypto/p256_key_exchange_openssl.cc',
               'quic/crypto/scoped_evp_aead_ctx.cc',
               'quic/crypto/scoped_evp_aead_ctx.h',
               'socket/ssl_client_socket_openssl.cc',
               'socket/ssl_client_socket_openssl.h',
               'socket/ssl_server_socket_openssl.cc',
               'socket/ssl_session_cache_openssl.cc',
               'socket/ssl_session_cache_openssl.h',
+            ],
+          },
+        ],
+        [ 'use_openssl_certs == 0', {
+            'sources!': [
+              'base/openssl_private_key_store.h',
+              'base/openssl_private_key_store_android.cc',
+              'base/openssl_private_key_store_memory.cc',
+              'cert/cert_database_openssl.cc',
+              'cert/cert_verify_proc_openssl.cc',
+              'cert/cert_verify_proc_openssl.h',
+              'cert/test_root_certs_openssl.cc',
+              'cert/x509_certificate_openssl.cc',
               'ssl/openssl_client_key_store.cc',
               'ssl/openssl_client_key_store.h',
             ],
-          },
-        ],
+        }],
         [ 'use_glib == 1', {
             'dependencies': [
               '../build/linux/system.gyp:gconf',
               '../build/linux/system.gyp:gio',
             ],
         }],
         [ 'desktop_linux == 1 or chromeos == 1', {
             'conditions': [
-              ['use_openssl==1', {
-                'dependencies': [
-                  '../third_party/openssl/openssl.gyp:openssl',
-                ],
-              },
-              {  # else use_openssl==0, use NSS
+              ['use_openssl == 0', {
+                 # use NSS
                 'dependencies': [
                   '../build/linux/system.gyp:ssl',
                 ],
               }],
               ['os_bsd==1', {
                 'sources!': [
                   'base/network_change_notifier_linux.cc',
                   'base/network_change_notifier_netlink_linux.cc',
                   'proxy/proxy_config_service_linux.cc',
                 ],
@@ skipping 88 matching lines @@
               'base/winsock_init.cc',
               'base/winsock_init.h',
               'base/winsock_util.cc',
               'base/winsock_util.h',
               'proxy/proxy_resolver_winhttp.cc',
               'proxy/proxy_resolver_winhttp.h',
             ],
           },
         ],
         [ 'OS == "mac"', {
-            'dependencies': [
-              '../third_party/nss/nss.gyp:nspr',
-              '../third_party/nss/nss.gyp:nss',
-              'third_party/nss/ssl.gyp:libssl',
+            'conditions': [
+                [ 'use_openssl == 0', {
+                    'dependencies': [
+                      # defaults to nss
+                      '../third_party/nss/nss.gyp:nspr',
+                      '../third_party/nss/nss.gyp:nss',
+                      'third_party/nss/ssl.gyp:libssl',
+                    ],
+                }],

[wtc, 2014/03/27 17:40:18]

Nit: I suggest indent by two, except for 'conditions', which we want to align
with 'link_settings' on line 1591. It's too bad the indentation level is
inconsistent in this file.

[haavardm, 2014/03/27 21:10:58]

Done.

             ],
             'link_settings': {
               'libraries': [
                 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
                 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
                 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
                 '$(SDKROOT)/usr/lib/libresolv.dylib',
               ]
             },
           },
@@ skipping 665 matching lines @@
             #               functionality is ported to OpenSSL.
             'sources!': [
               'cert/ct_objects_extractor_unittest.cc',
               'cert/multi_log_ct_verifier_unittest.cc',
               'cert/nss_cert_database_unittest.cc',
               'cert/x509_util_nss_unittest.cc',
               'quic/test_tools/crypto_test_utils_nss.cc',
             ],
           }, {  # else !use_openssl: remove the unneeded files
             'sources!': [
               'cert/x509_util_openssl_unittest.cc',

[wtc, 2014/03/27 17:40:18]

I am wondering why this doesn't need to move to the use_openssl_certs == 0
block.

[wtc, 2014/03/27 18:26:25]

OK, this file doesn't test any function that operates on net::X509Certificate.

               'quic/test_tools/crypto_test_utils_openssl.cc',
               'socket/ssl_client_socket_openssl_unittest.cc',
               'socket/ssl_session_cache_openssl_unittest.cc',
-              'ssl/openssl_client_key_store_unittest.cc',
             ],
           },
         ],
+        [ 'use_openssl_certs == 0', {
+            'sources!': [
+              'ssl/openssl_client_key_store_unittest.cc',
+            ],
+        }],
         [ 'enable_websockets != 1', {
             'sources/': [
               ['exclude', '^socket_stream/'],
               ['exclude', '^websockets/'],
               ['exclude', '^spdy/spdy_websocket_stream_unittest\\.cc$'],
             ],
         }],
         [ 'disable_ftp_support==1', {
             'sources/': [
               ['exclude', '^ftp/'],
@@ skipping 47 matching lines @@
                 # TODO(mark): Specifying this here shouldn't be necessary.
                 'dependencies': [
                   '../third_party/icu/icu.gyp:icudata',
                 ],
               }],
             ],
             # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
             'msvs_disabled_warnings': [4267, ],
           },
         ],
-        [ 'OS == "mac"', {
+        [ 'OS == "mac" and use_openssl == 0', {
             'dependencies': [
               '../third_party/nss/nss.gyp:nspr',
               '../third_party/nss/nss.gyp:nss',
               'third_party/nss/ssl.gyp:libssl',
             ],
           },
         ],
         [ 'OS == "ios"', {
             'dependencies': [
               '../third_party/nss/nss.gyp:nss',
@@ skipping 1061 matching lines @@
             'java_in_dir': 'cronet/android/sample/javatests',
             'resource_dir': 'cronet/android/sample/res',
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],  # OS=="android"
   ],
 }