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

Unified Diff: webrtc/base/ssladapter.cc

Issue 1383253002: Get rid of SCHANNEL code. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 years, 2 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/schanneladapter.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/ssladapter.cc
diff --git a/webrtc/base/ssladapter.cc b/webrtc/base/ssladapter.cc
index 77ad90b504154b6ae62772abd713323b4b19104a..454a56637d7b9de76f5125968cf91a6cd59362f0 100644
--- a/webrtc/base/ssladapter.cc
+++ b/webrtc/base/ssladapter.cc
@@ -16,15 +16,11 @@
#include "webrtc/base/sslconfig.h"
-#if SSL_USE_SCHANNEL
-
-#include "schanneladapter.h"
-
-#elif SSL_USE_OPENSSL // && !SSL_USE_SCHANNEL
+#if SSL_USE_OPENSSL
#include "openssladapter.h"
-#endif // SSL_USE_OPENSSL && !SSL_USE_SCHANNEL
+#endif
///////////////////////////////////////////////////////////////////////////////
@@ -32,14 +28,12 @@ namespace rtc {
SSLAdapter*
SSLAdapter::Create(AsyncSocket* socket) {
-#if SSL_USE_SCHANNEL
- return new SChannelAdapter(socket);
-#elif SSL_USE_OPENSSL // && !SSL_USE_SCHANNEL
+#if SSL_USE_OPENSSL
return new OpenSSLAdapter(socket);
-#else // !SSL_USE_OPENSSL && !SSL_USE_SCHANNEL
+#else // !SSL_USE_OPENSSL
delete socket;
return NULL;
-#endif // !SSL_USE_OPENSSL && !SSL_USE_SCHANNEL
+#endif // SSL_USE_OPENSSL
}
///////////////////////////////////////////////////////////////////////////////
@@ -72,7 +66,7 @@ bool CleanupSSL() {
return true;
}
-#endif // !SSL_USE_OPENSSL
+#endif // SSL_USE_OPENSSL
///////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « webrtc/base/schanneladapter.cc ('k') | webrtc/base/sslidentity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698