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

crypto/encryptor.h

Index: crypto/encryptor.h
diff --git a/crypto/encryptor.h b/crypto/encryptor.h
index 8a27a90f10d6e9f983bbf36ad48696abce880905..f2c0c8b3e22a9c88267e4368fbea7c146407b1cc 100644
--- a/crypto/encryptor.h
+++ b/crypto/encryptor.h
@@ -14,10 +14,8 @@
 #include "build/build_config.h"
 #include "crypto/crypto_export.h"
 
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)
 #include "crypto/scoped_nss_types.h"
-#elif defined(OS_WIN)
-#include "crypto/scoped_capi_types.h"
 #endif
 
 namespace crypto {
@@ -33,7 +31,7 @@ class CRYPTO_EXPORT Encryptor {
 
   // This class implements a 128-bits counter to be used in AES-CTR encryption.
   // Only 128-bits counter is supported in this class.
-  class Counter {
+  class CRYPTO_EXPORT Counter {

[Ryan Sleevi, 2012/06/14 19:35:26]

You shouldn't have to export the child class; because the parent is exported,
these symbols should be visible.

Got a link to a compile error?

[ddorwin, 2012/06/14 20:44:19]

Tell that to the Windows shared libraries build. :)

Before I added it, I got these link errors:

LINK crypto_unittests.exe
FAILED: python gyp-win-tool link-wrapper "C:\Program Files (x86)\Microsoft
Visual Studio 10.0\VC\bin\link.exe" /nologo /OUT:crypto_unittests.exe
/PDB:crypto_uni
ttests.exe.pdb @crypto_unittests.exe.rsp
crypto_unittests.encryptor_unittest.obj : error LNK2019: unresolved external
symbol "public: __thiscall crypto::Encryptor::Counter::~Counter(void)"
(??1Counter@
Encryptor@crypto@@QAE@XZ) referenced in function "private: virtual void
__thiscall EncryptorTest_CTRCounter_Test::TestBody(void)"
(?TestBody@EncryptorTest_CTRCo
unter_Test@@EAEXXZ)
crypto_unittests.encryptor_unittest.obj : error LNK2019: unresolved external
symbol "public: void __thiscall crypto::Encryptor::Counter::Write(void *)"
(?Write@
Counter@Encryptor@crypto@@QAEXPAX@Z) referenced in function "private: virtual
void __thiscall EncryptorTest_CTRCounter_Test::TestBody(void)"
(?TestBody@Encrypto
rTest_CTRCounter_Test@@EAEXXZ)
crypto_unittests.encryptor_unittest.obj : error LNK2019: unresolved external
symbol "public: bool __thiscall crypto::Encryptor::Counter::Increment(void)"
(?Incr
ement@Counter@Encryptor@crypto@@QAE_NXZ) referenced in function "private:
virtual void __thiscall EncryptorTest_CTRCounter_Test::TestBody(void)"
(?TestBody@Encr
yptorTest_CTRCounter_Test@@EAEXXZ)
crypto_unittests.encryptor_unittest.obj : error LNK2019: unresolved external
symbol "public: __thiscall crypto::Encryptor::Counter::Counter(class
base::BasicStr
ingPiece<class std::basic_string<char,struct std::char_traits<char>,class
std::allocator<char> > > const &)"
(??0Counter@Encryptor@crypto@@QAE@ABV?$BasicStringP
iece@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@base@@@Z)
referenced in function "private: virtual void __thiscall
EncryptorTest_CTRCounter_
Test::TestBody(void)" (?TestBody@EncryptorTest_CTRCounter_Test@@EAEXXZ)
crypto_unittests.exe : fatal error LNK1120: 4 unresolved externals
ninja: build stopped: subcommand failed.

    public:
     explicit Counter(const base::StringPiece& counter);
     ~Counter();
@@ -121,7 +119,7 @@ class CRYPTO_EXPORT Encryptor {
              const base::StringPiece& input,
              std::string* output);
   std::string iv_;
-#elif defined(USE_NSS)
+#elif defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)
   bool Crypt(PK11Context* context,
              const base::StringPiece& input,
              std::string* output);
@@ -130,15 +128,6 @@ class CRYPTO_EXPORT Encryptor {
                 std::string* output);
   ScopedPK11Slot slot_;
   ScopedSECItem param_;
-#elif defined(OS_MACOSX)
-  bool Crypt(int /*CCOperation*/ op,
-             const base::StringPiece& input,
-             std::string* output);
-
-  std::string iv_;
-#elif defined(OS_WIN)
-  ScopedHCRYPTKEY capi_key_;
-  DWORD block_size_;
 #endif
 };