Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Unified Diff: crypto/symmetric_key.h

Issue 1882433002: Removing NSS files and USE_OPENSSL flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « crypto/signature_verifier_nss.cc ('k') | crypto/symmetric_key_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/symmetric_key.h
diff --git a/crypto/symmetric_key.h b/crypto/symmetric_key.h
index 14f74aeb7473767e4f354ce652239423201d4498..b24e2dfe83dd8b9b0861c2bc9c6a1ece8618680e 100644
--- a/crypto/symmetric_key.h
+++ b/crypto/symmetric_key.h
@@ -17,9 +17,6 @@
// 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)))
-#include "crypto/scoped_nss_types.h"
#endif
namespace crypto {
@@ -62,10 +59,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 +83,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);
« no previous file with comments | « crypto/signature_verifier_nss.cc ('k') | crypto/symmetric_key_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698