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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/base/sslconfig.h

Issue 1311843006: Revert of purge nss files and dependencies (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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 | « webrtc/base/ssladapter.cc ('k') | webrtc/base/sslidentity.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/sslconfig.h
diff --git a/webrtc/base/sslconfig.h b/webrtc/base/sslconfig.h
index 6aabad07a82555eaab7f38b5285b683a7e30a93c..d824ab0627c1c7598d8edcbe88cfe0b93bd1e33b 100644
--- a/webrtc/base/sslconfig.h
+++ b/webrtc/base/sslconfig.h
@@ -13,7 +13,8 @@
// If no preference has been indicated, default to SChannel on Windows and
// OpenSSL everywhere else, if it is available.
-#if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL)
+#if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL) && \
+ !defined(SSL_USE_NSS)
#if defined(WEBRTC_WIN)
#define SSL_USE_SCHANNEL 1
@@ -22,6 +23,8 @@
#if defined(HAVE_OPENSSL_SSL_H)
#define SSL_USE_OPENSSL 1
+#elif defined(HAVE_NSS_SSL_H)
+#define SSL_USE_NSS 1
#endif
#endif // !defined(WEBRTC_WIN)
« no previous file with comments | « webrtc/base/ssladapter.cc ('k') | webrtc/base/sslidentity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698