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

Unified Diff: webrtc/base/ssladapter.cc

Issue 2648003003: Revert of Removing #defines previously used for building without BoringSSL/OpenSSL. (Closed)
Patch Set: Created 3 years, 11 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/ssladapter_unittest.cc » ('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 06fce549020b214f03c01e76b0e171b64a94000a..ba24e618ec3c158fa4266466d4b535703712a430 100644
--- a/webrtc/base/ssladapter.cc
+++ b/webrtc/base/ssladapter.cc
@@ -10,7 +10,13 @@
#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/openssladapter.h"
+#include "webrtc/base/sslconfig.h"
+
+#if SSL_USE_OPENSSL
+
+#include "openssladapter.h"
+
+#endif
///////////////////////////////////////////////////////////////////////////////
@@ -18,10 +24,17 @@
SSLAdapter*
SSLAdapter::Create(AsyncSocket* socket) {
+#if SSL_USE_OPENSSL
return new OpenSSLAdapter(socket);
+#else // !SSL_USE_OPENSSL
+ delete socket;
+ return NULL;
+#endif // SSL_USE_OPENSSL
}
///////////////////////////////////////////////////////////////////////////////
+
+#if SSL_USE_OPENSSL
bool InitializeSSL(VerificationCallback callback) {
return OpenSSLAdapter::InitializeSSL(callback);
@@ -35,6 +48,22 @@
return OpenSSLAdapter::CleanupSSL();
}
+#else // !SSL_USE_OPENSSL
+
+bool InitializeSSL(VerificationCallback callback) {
+ return true;
+}
+
+bool InitializeSSLThread() {
+ return true;
+}
+
+bool CleanupSSL() {
+ return true;
+}
+
+#endif // SSL_USE_OPENSSL
+
///////////////////////////////////////////////////////////////////////////////
} // namespace rtc
« no previous file with comments | « webrtc/base/opensslstreamadapter.cc ('k') | webrtc/base/ssladapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698