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

Unified Diff: webrtc/base/ssladapter.cc

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/opensslstreamadapter.cc ('k') | webrtc/base/sslconfig.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/ssladapter.cc
diff --git a/webrtc/base/ssladapter.cc b/webrtc/base/ssladapter.cc
index 77ad90b504154b6ae62772abd713323b4b19104a..d83a2779e8e1230ca0d1fc8c557cae50d01037c2 100644
--- a/webrtc/base/ssladapter.cc
+++ b/webrtc/base/ssladapter.cc
@@ -24,7 +24,11 @@
#include "openssladapter.h"
-#endif // SSL_USE_OPENSSL && !SSL_USE_SCHANNEL
+#elif SSL_USE_NSS // && !SSL_USE_CHANNEL && !SSL_USE_OPENSSL
+
+#include "nssstreamadapter.h"
+
+#endif // SSL_USE_OPENSSL && !SSL_USE_SCHANNEL && !SSL_USE_NSS
///////////////////////////////////////////////////////////////////////////////
@@ -58,7 +62,21 @@
return OpenSSLAdapter::CleanupSSL();
}
-#else // !SSL_USE_OPENSSL
+#elif SSL_USE_NSS // !SSL_USE_OPENSSL
+
+bool InitializeSSL(VerificationCallback callback) {
+ return NSSContext::InitializeSSL(callback);
+}
+
+bool InitializeSSLThread() {
+ return NSSContext::InitializeSSLThread();
+}
+
+bool CleanupSSL() {
+ return NSSContext::CleanupSSL();
+}
+
+#else // !SSL_USE_OPENSSL && !SSL_USE_NSS
bool InitializeSSL(VerificationCallback callback) {
return true;
@@ -72,7 +90,7 @@
return true;
}
-#endif // !SSL_USE_OPENSSL
+#endif // !SSL_USE_OPENSSL && !SSL_USE_NSS
///////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « webrtc/base/opensslstreamadapter.cc ('k') | webrtc/base/sslconfig.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698