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

Unified Diff: webrtc/base/sslidentity.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/ssladapter.cc ('k') | webrtc/base/sslstreamadapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/sslidentity.cc
diff --git a/webrtc/base/sslidentity.cc b/webrtc/base/sslidentity.cc
index ed9e5aca93f172010dcc727df197c3e7e32af9d1..ce209dd4167c2211fdc80649be4dca7a48b3b487 100644
--- a/webrtc/base/sslidentity.cc
+++ b/webrtc/base/sslidentity.cc
@@ -21,13 +21,11 @@
#include "webrtc/base/logging.h"
#include "webrtc/base/sslconfig.h"
-#if SSL_USE_SCHANNEL
-
-#elif SSL_USE_OPENSSL // !SSL_USE_SCHANNEL
+#if SSL_USE_OPENSSL
#include "webrtc/base/opensslidentity.h"
-#endif // SSL_USE_SCHANNEL
+#endif // SSL_USE_OPENSSL
namespace rtc {
@@ -103,27 +101,7 @@ SSLCertChain::~SSLCertChain() {
std::for_each(certs_.begin(), certs_.end(), DeleteCert);
}
-#if SSL_USE_SCHANNEL
-
-SSLCertificate* SSLCertificate::FromPEMString(const std::string& pem_string) {
- return NULL;
-}
-
-SSLIdentity* SSLIdentity::Generate(const std::string& common_name,
- KeyType key_type) {
- return NULL;
-}
-
-SSLIdentity* GenerateForTest(const SSLIdentityParams& params) {
- return NULL;
-}
-
-SSLIdentity* SSLIdentity::FromPEMStrings(const std::string& private_key,
- const std::string& certificate) {
- return NULL;
-}
-
-#elif SSL_USE_OPENSSL // !SSL_USE_SCHANNEL
+#if SSL_USE_OPENSSL
SSLCertificate* SSLCertificate::FromPEMString(const std::string& pem_string) {
return OpenSSLCertificate::FromPEMString(pem_string);
@@ -143,10 +121,10 @@ SSLIdentity* SSLIdentity::FromPEMStrings(const std::string& private_key,
return OpenSSLIdentity::FromPEMStrings(private_key, certificate);
}
-#else // !SSL_USE_OPENSSL && !SSL_USE_SCHANNEL
+#else // !SSL_USE_OPENSSL
#error "No SSL implementation"
-#endif // SSL_USE_SCHANNEL
+#endif // SSL_USE_OPENSSL
} // namespace rtc
« no previous file with comments | « webrtc/base/ssladapter.cc ('k') | webrtc/base/sslstreamadapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698