Use NSS for symmetric key crypto operations on Windows and Mac.

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,
     # Put all transitive dependencies for Windows HMAC here.
     # This is required so that we can build them for nacl win64.
     'hmac_win64_related_sources': [
@@ skipping 35 matching lines @@
             [ 'chromeos==1', {
                 'sources/': [ ['include', '_chromeos\\.cc$'] ]
               },
             ],
           ],
         }, {  # os_posix != 1 or OS == "mac" or OS == "android"
             'sources/': [
               ['exclude', '_nss\.cc$'],
               ['include', 'ec_private_key_nss\.cc$'],
               ['include', 'ec_signature_creator_nss\.cc$'],
+              ['include', 'encryptor_nss\.cc$'],
+              ['include', 'hmac_nss\.cc$'],
               ['include', 'signature_verifier_nss\.cc$'],
+              ['include', 'symmetric_key_nss\.cc$'],
             ],
             'sources!': [
+              'hmac_win.cc',
               'openpgp_symmetric_encryption.cc',
+              'openpgp_symmetric_encryption.h',
+              'symmetric_key_win.cc',
+              # TODO(ddorwin): Delete all of these files and remove them from here. 
+              'encryptor_mac.cc',
+              'encryptor_win.cc',
+              'hmac_mac.cc',
+              'symmetric_key_mac.cc',

[Ryan Sleevi, 2012/06/13 20:39:51]

nit: sorting
nit: line wrapping

issue: You already removed these from the 'sources' list (line 146-219), so this
is not needed. Perhaps that's what you meant by the TODO, in which case, it's
TODONE?

[ddorwin, 2012/06/13 21:53:23]

Done.
I misunderstood and thought *_win.* were automatically added.

             ],
         }],
         [ 'OS == "android"', {
             'dependencies': [
               '../third_party/openssl/openssl.gyp:openssl',
             ],
             'sources/': [
               ['exclude', 'ec_private_key_nss\.cc$'],
               ['exclude', 'ec_signature_creator_nss\.cc$'],
               ['exclude', 'signature_verifier_nss\.cc$'],

[Ryan Sleevi, 2012/06/13 20:39:51]

You need to update this section with the changes you made on 56-59

[ddorwin, 2012/06/13 21:53:23]

Done.

             ],
         }],
         [ 'os_bsd==1', {
           'link_settings': {
             'libraries': [
               '-L/usr/local/lib -lexecinfo',
               ],
             },
           },
         ],
         [ 'OS == "mac"', {
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/Security.framework',
             ],
           },
         }, {  # OS != "mac"
           'sources!': [
             'cssm_init.cc',
             'cssm_init.h',
             'mac_security_services_lock.cc',
             'mac_security_services_lock.h',
           ],
         }],
         [ 'OS == "mac" 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',

[Ryan Sleevi, 2012/06/13 20:39:51]

Just to confirm this is absolutely necessary. It should only be the case if
[encryptor.h / hmac.h / symmetric_key.h] are including NSS/NSPR headers.

If so, can we forward declare the types, as done in [signature_verifier.h /
ec_private_key.h / ec_signature_creator.h]?

If not, I don't think I'll lose sleep over it, but it's just potentially one
more build serialization step that would be nice to avoid if possible.

[ddorwin, 2012/06/13 21:53:23]

I got this from Matt. I'll try building without it.

[ddorwin, 2012/06/13 22:43:42]

Removing them caused the following error on Mac:

In file included from ../../media/crypto/aes_decryptor.cc:10:
In file included from ../../crypto/encryptor.h:18:
../../crypto/scoped_nss_types.h:9:10: fatal error: 'keyhi.h' file not found
#include <keyhi.h>
         ^

I spent a while trying to remove the pk11pub.h includes from scoped_nss_types.h,
but I think it will require some major refactoring.  For example,
symmetric_key.h defines SymmetricKey, which has a ScopedPK11SymKey member. I
think SymmetricKey would need to define an interface and/or use a PImpl.

So, I'd like to leave this here for now. I can file a bug if you want.

+          ],
         }],
         [ 'OS != "win"', {
           'sources!': [
             'capi_util.h',
             'capi_util.cc',
           ],
         }],
         [ 'use_openssl==1', {
             # TODO(joth): Use a glob to match exclude patterns once the
             #             OpenSSL file set is complete.
@@ skipping 47 matching lines @@
         'ec_private_key.h',
         'ec_private_key_nss.cc',
         'ec_private_key_openssl.cc',
         'ec_signature_creator.cc',
         'ec_signature_creator.h',
         'ec_signature_creator_impl.h',
         'ec_signature_creator_nss.cc',
         'ec_signature_creator_openssl.cc',
         'encryptor.cc',
         'encryptor.h',
-        'encryptor_mac.cc',
         'encryptor_nss.cc',
         'encryptor_openssl.cc',
-        'encryptor_win.cc',
-        'hmac_mac.cc',
         'hmac_nss.cc',
         'hmac_openssl.cc',
         'keychain_mac.cc',
         'keychain_mac.h',
         'mac_security_services_lock.cc',
         'mac_security_services_lock.h',
         'mock_keychain_mac.cc',
         'mock_keychain_mac.h',
         'p224_spake.cc',
         'p224_spake.h',
@@ skipping 20 matching lines @@
         'sha2.cc',
         'sha2.h',
         'signature_creator.h',
         'signature_creator_mac.cc',
         'signature_creator_nss.cc',
         'signature_creator_openssl.cc',
         'signature_creator_win.cc',
         'signature_verifier.h',
         'signature_verifier_nss.cc',
         'signature_verifier_openssl.cc',
-        'symmetric_key_mac.cc',
         'symmetric_key_nss.cc',
         'symmetric_key_openssl.cc',
         'third_party/nss/chromium-blapi.h',
         'third_party/nss/chromium-blapit.h',
         'third_party/nss/chromium-nss.h',
         'third_party/nss/pk11akey.cc',
         'third_party/nss/secsign.cc',
       ],
     },
     {
@@ skipping 74 matching lines @@
           'type': '<(component)',
           'dependencies': [
             '../base/base.gyp:base_nacl_win64',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
           ],
           'sources': [
             '<@(hmac_win64_related_sources)',
           ],
           'defines': [
            'CRYPTO_IMPLEMENTATION',
+           'NACL_WIN64',

[Ryan Sleevi, 2012/06/13 20:39:51]

This should be '<@(nacl_win64_defines)'

[ddorwin, 2012/06/13 21:53:23]

Done.

           ],
           'msvs_disabled_warnings': [
             4018,
           ],
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }