| Index: webrtc/base/sslstreamadapter.cc
|
| diff --git a/webrtc/base/sslstreamadapter.cc b/webrtc/base/sslstreamadapter.cc
|
| index 39426cdb74e49c1d67645a262ce6b2b304345a3a..42dea9c0362f6910f550a36830e4dade3cecc5f1 100644
|
| --- a/webrtc/base/sslstreamadapter.cc
|
| +++ b/webrtc/base/sslstreamadapter.cc
|
| @@ -23,11 +23,7 @@
|
|
|
| #include "webrtc/base/opensslstreamadapter.h"
|
|
|
| -#elif SSL_USE_NSS // && !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL
|
| -
|
| -#include "webrtc/base/nssstreamadapter.h"
|
| -
|
| -#endif // !SSL_USE_OPENSSL && !SSL_USE_SCHANNEL && !SSL_USE_NSS
|
| +#endif // !SSL_USE_OPENSSL && !SSL_USE_SCHANNEL
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| @@ -38,9 +34,7 @@ SSLStreamAdapter* SSLStreamAdapter::Create(StreamInterface* stream) {
|
| return NULL;
|
| #elif SSL_USE_OPENSSL // !SSL_USE_SCHANNEL
|
| return new OpenSSLStreamAdapter(stream);
|
| -#elif SSL_USE_NSS // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL
|
| - return new NSSStreamAdapter(stream);
|
| -#else // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL && !SSL_USE_NSS
|
| +#else // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL
|
| return NULL;
|
| #endif
|
| }
|
| @@ -90,21 +84,7 @@ std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version,
|
| KeyType key_type) {
|
| return OpenSSLStreamAdapter::GetDefaultSslCipher(version, key_type);
|
| }
|
| -#elif SSL_USE_NSS
|
| -bool SSLStreamAdapter::HaveDtls() {
|
| - return NSSStreamAdapter::HaveDtls();
|
| -}
|
| -bool SSLStreamAdapter::HaveDtlsSrtp() {
|
| - return NSSStreamAdapter::HaveDtlsSrtp();
|
| -}
|
| -bool SSLStreamAdapter::HaveExporter() {
|
| - return NSSStreamAdapter::HaveExporter();
|
| -}
|
| -std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version,
|
| - KeyType key_type) {
|
| - return NSSStreamAdapter::GetDefaultSslCipher(version, key_type);
|
| -}
|
| -#endif // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL && !SSL_USE_NSS
|
| +#endif // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
|
|