| Index: crypto/symmetric_key.h
|
| diff --git a/crypto/symmetric_key.h b/crypto/symmetric_key.h
|
| index 14f74aeb7473767e4f354ce652239423201d4498..7b692106e4642d40c4728e37c0f96a4f6ed448da 100644
|
| --- a/crypto/symmetric_key.h
|
| +++ b/crypto/symmetric_key.h
|
| @@ -17,8 +17,7 @@
|
| // See comments for crypto_nacl_win64 in crypto.gyp.
|
| // Must test for NACL_WIN64 before OS_WIN since former is a subset of latter.
|
| #include "crypto/scoped_capi_types.h"
|
| -#elif defined(USE_NSS_CERTS) || \
|
| - (!defined(USE_OPENSSL) && (defined(OS_WIN) || defined(OS_MACOSX)))
|
| +#elif defined(USE_NSS_CERTS)
|
| #include "crypto/scoped_nss_types.h"
|
| #endif
|
|
|
| @@ -62,10 +61,8 @@ class CRYPTO_EXPORT SymmetricKey {
|
|
|
| #if defined(NACL_WIN64)
|
| HCRYPTKEY key() const { return key_.get(); }
|
| -#elif defined(USE_OPENSSL)
|
| +#else
|
| const std::string& key() { return key_; }
|
| -#elif defined(USE_NSS_CERTS) || defined(OS_WIN) || defined(OS_MACOSX)
|
| - PK11SymKey* key() const { return key_.get(); }
|
| #endif
|
|
|
| // Extracts the raw key from the platform specific data.
|
| @@ -88,12 +85,9 @@ class CRYPTO_EXPORT SymmetricKey {
|
| // 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_OPENSSL)
|
| +#else
|
| SymmetricKey() {}
|
| std::string key_;
|
| -#elif defined(USE_NSS_CERTS) || defined(OS_WIN) || defined(OS_MACOSX)
|
| - explicit SymmetricKey(PK11SymKey* key);
|
| - ScopedPK11SymKey key_;
|
| #endif
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SymmetricKey);
|
|
|