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

crypto/crypto.gyp

Index: crypto/crypto.gyp
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
index fdc0fa9c86ac49e84b893eefb148980d61ba6889..3f611a32dc4ca07e0cd646b62bd39b3189e4f862 100644
--- a/crypto/crypto.gyp
+++ b/crypto/crypto.gyp
@@ -53,10 +53,21 @@
               ['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"', {
@@ -96,6 +107,10 @@
             '../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!': [
@@ -163,11 +178,8 @@
         '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',
@@ -208,7 +220,6 @@
         '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',
@@ -303,6 +314,7 @@
           ],
           '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,