Index: webrtc/base/ssladapter.cc |
diff --git a/webrtc/base/ssladapter.cc b/webrtc/base/ssladapter.cc |
index ba24e618ec3c158fa4266466d4b535703712a430..06fce549020b214f03c01e76b0e171b64a94000a 100644 |
--- a/webrtc/base/ssladapter.cc |
+++ b/webrtc/base/ssladapter.cc |
@@ -10,13 +10,7 @@ |
#include "webrtc/base/ssladapter.h" |
-#include "webrtc/base/sslconfig.h" |
- |
-#if SSL_USE_OPENSSL |
- |
-#include "openssladapter.h" |
- |
-#endif |
+#include "webrtc/base/openssladapter.h" |
/////////////////////////////////////////////////////////////////////////////// |
@@ -24,18 +18,11 @@ namespace rtc { |
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); |
} |
@@ -48,22 +35,6 @@ bool CleanupSSL() { |
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 |