| 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
|
|
|