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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: crypto/symmetric_key.h

Issue 206453002: Introduce USE_OPENSSL_CERTS for certificate handling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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
« crypto/encryptor.h ('K') | « crypto/encryptor.h ('k') | net/cert/cert_verify_proc.cc » ('j') | net/cert/cert_verify_proc.cc » ('J')
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 cce2a9b4df18b38d227ebd7c1babca9ebc4190f4..62c95fa1d22b86d373646dbeaeb58911c1721659 100644
--- a/crypto/symmetric_key.h
+++ b/crypto/symmetric_key.h
@@ -14,7 +14,8 @@
// 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) || defined(OS_WIN) || defined(OS_MACOSX)
+#elif !defined(USE_OPENSSL) && \
+ (defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX))
#include "crypto/scoped_nss_types.h"
#endif
« crypto/encryptor.h ('K') | « crypto/encryptor.h ('k') | net/cert/cert_verify_proc.cc » ('j') | net/cert/cert_verify_proc.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698