Introduce USE_OPENSSL_CERTS for certificate handling.

crypto/crypto.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'crypto.gypi',
@@ skipping 21 matching lines @@
           'export_dependent_settings': [
             '../build/linux/system.gyp:ssl',
           ],
           'conditions': [
             [ 'chromeos==1', {
                 'sources/': [ ['include', '_chromeos\\.cc$'] ]
               },
             ],
           ],
         }, {  # os_posix != 1 or OS == "mac" or OS == "ios" or OS == "android"
+            'conditions': [
+                [ 'use_openssl == 1', {

[wtc, 2014/03/20 21:14:56]

1. The indentation level should be two spaces rather than four spaces. (I know
the indentation level is not consistent in this file.)

2. It seems that we should be able to specify the dependency on openssl at a
higher-level in one place, rather than in two places (here and line 64-66)).

[mattm, 2014/03/20 23:40:24]

I agree (see https://codereview.chromium.org/205813004)

[haavardm, 2014/03/21 18:48:16]

Right. I'll wait until your patch is committed, and update my cl accordingly.

+                  'dependencies': [
+                    '../third_party/openssl/openssl.gyp:openssl'
+                  ]
+                }],
+            ],
             'sources!': [
               'hmac_win.cc',
               'openpgp_symmetric_encryption.cc',
               'openpgp_symmetric_encryption.h',
               'symmetric_key_win.cc',
             ],
         }],
         [ 'OS != "mac" and OS != "ios"', {
           'sources!': [
             'apple_keychain.h',
@@ skipping 32 matching lines @@
             ],
           },
         }, {  # OS != "mac"
           'sources!': [
             'cssm_init.cc',
             'cssm_init.h',
             'mac_security_services_lock.cc',
             'mac_security_services_lock.h',
           ],
         }],
-        [ 'OS == "mac" or OS == "ios" or OS == "win"', {
+        [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', {
           'dependencies': [
             '../third_party/nss/nss.gyp:nspr',
             '../third_party/nss/nss.gyp:nss',
           ],
           'export_dependent_settings': [
             '../third_party/nss/nss.gyp:nspr',
             '../third_party/nss/nss.gyp:nss',
           ],
         }],
         [ 'OS != "win"', {
@@ skipping 96 matching lines @@
           ],
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
         }, {  # os_posix != 1 or OS == "mac" or OS == "android" or OS == "ios"
           'sources!': [
             'rsa_private_key_nss_unittest.cc',
             'openpgp_symmetric_encryption_unittest.cc',
           ]
         }],
-        [ 'OS == "mac" or OS == "ios" or OS == "win"', {
+        [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', {
           'dependencies': [
             '../third_party/nss/nss.gyp:nss',
           ],
         }],
-        [ 'OS == "mac"', {
+        [ 'use_openssl == 0 and OS == "mac"', {

[wtc, 2014/03/20 21:14:56]

I think these two blocks can be simply deleted. We should get the dependency on
nss and nspr from the export_dependent_settings of the "crypto" target.

If not, I think at least this block can be deleted.

[haavardm, 2014/03/21 13:08:21]

Thanks, I'll test.

On 2014/03/20 21:14:56, wtc wrote:

[haavardm, 2014/03/24 18:48:52]

Done.

           'dependencies': [
             '../third_party/nss/nss.gyp:nspr',
           ],
         }],
         [ 'OS == "win"', {
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
         }],
         [ 'use_openssl==1', {
           'sources!': [
@@ skipping 31 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }