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..2b59ec6c69f6d7c8e7d693dc5ae95fee2dc82e68 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_OPENSSL)

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

For all code like this, my preference is to use positive assertions, rather than
negative. While longer, it makes it clear what the conditions are for depending
on something.

#if defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)

Same also for line 122.

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

Done.

 #include "crypto/scoped_nss_types.h"
-#elif defined(OS_WIN)
-#include "crypto/scoped_capi_types.h"
 #endif
 
 namespace crypto {
@@ -121,7 +119,7 @@ class CRYPTO_EXPORT Encryptor {
              const base::StringPiece& input,
              std::string* output);
   std::string iv_;
-#elif defined(USE_NSS)
+#else
   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
 };