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

crypto/symmetric_key.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef CRYPTO_SYMMETRIC_KEY_H_
 #define CRYPTO_SYMMETRIC_KEY_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "crypto/crypto_export.h"
 
-#if defined(USE_NSS)
+#if defined(NACL_WIN64)

[wtc, 2012/06/14 21:28:48]

Please add a comment to explain NACL_WIN64, and point out
it must be tested before OS_WIN.

[ddorwin, 2012/06/14 22:01:55]

Done.
I explained it in crypto.gyp (I hope I got that right) and referred to that
here. It seems crypto.gyp is the right place to explain this since there are so
many files affected.

+#include "crypto/scoped_capi_types.h"
+#elif defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)
 #include "crypto/scoped_nss_types.h"
-#elif defined(OS_MACOSX)
-#include <Security/cssmtype.h>
-#elif defined(OS_WIN)
-#include "crypto/scoped_capi_types.h"
 #endif
 
 namespace crypto {
 
 // Wraps a platform-specific symmetric key and allows it to be held in a
 // scoped_ptr.
 class CRYPTO_EXPORT SymmetricKey {
  public:
   // Defines the algorithm that a key will be used with. See also
   // classs Encrptor.
@@ skipping 22 matching lines @@
                                              size_t key_size_in_bits);
 
   // Imports an array of key bytes in |raw_key|. This key may have been
   // generated by GenerateRandomKey or DeriveKeyFromPassword and exported with
   // GetRawKey, or via another compatible method. The key must be of suitable
   // size for use with |algorithm|. The caller owns the returned SymmetricKey.
   static SymmetricKey* Import(Algorithm algorithm, const std::string& raw_key);
 
 #if defined(USE_OPENSSL)
   const std::string& key() { return key_; }
-#elif defined(USE_NSS)
+#elif defined(NACL_WIN64)
+  HCRYPTKEY key() const { return key_.get(); }
+#elif defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)
   PK11SymKey* key() const { return key_.get(); }
-#elif defined(OS_MACOSX)
-  CSSM_DATA cssm_data() const;
-#elif defined(OS_WIN)
-  HCRYPTKEY key() const { return key_.get(); }
 #endif
 
   // Extracts the raw key from the platform specific data.
   // Warning: |raw_key| holds the raw key as bytes and thus must be handled
   // carefully.
   bool GetRawKey(std::string* raw_key);
 
 #if defined(OS_CHROMEOS)
   // Creates symmetric key from NSS key. Takes over the ownership of |key|.
   static SymmetricKey* CreateFromKey(PK11SymKey* key);
 #endif
 
  private:
 #if defined(USE_OPENSSL)
   SymmetricKey() {}
   std::string key_;
-#elif defined(USE_NSS)
-  explicit SymmetricKey(PK11SymKey* key);
-  ScopedPK11SymKey key_;
-#elif defined(OS_MACOSX)
-  SymmetricKey(const void* key_data, size_t key_size_in_bits);
-  std::string key_;
-#elif defined(OS_WIN)
+#elif defined(NACL_WIN64)
   SymmetricKey(HCRYPTPROV provider, HCRYPTKEY key,
                const void* key_data, size_t key_size_in_bytes);
 
   ScopedHCRYPTPROV provider_;
   ScopedHCRYPTKEY key_;
 
   // Contains the raw key, if it is known during initialization and when it
   // is likely that the associated |provider_| will be unable to export the
   // |key_|. This is the case of HMAC keys when the key size exceeds 16 bytes
   // when using the default RSA provider.
   // TODO(rsleevi): See if KP_EFFECTIVE_KEYLEN is the reason why CryptExportKey
   // fails with NTE_BAD_KEY/NTE_BAD_LEN
   std::string raw_key_;
+#elif defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)
+  explicit SymmetricKey(PK11SymKey* key);
+  ScopedPK11SymKey key_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(SymmetricKey);
 };
 
 }  // namespace crypto
 
 #endif  // CRYPTO_SYMMETRIC_KEY_H_