| Index: webrtc/base/ssladapter.cc
|
| diff --git a/webrtc/base/ssladapter.cc b/webrtc/base/ssladapter.cc
|
| index 77ad90b504154b6ae62772abd713323b4b19104a..d83a2779e8e1230ca0d1fc8c557cae50d01037c2 100644
|
| --- a/webrtc/base/ssladapter.cc
|
| +++ b/webrtc/base/ssladapter.cc
|
| @@ -24,7 +24,11 @@
|
|
|
| #include "openssladapter.h"
|
|
|
| -#endif // SSL_USE_OPENSSL && !SSL_USE_SCHANNEL
|
| +#elif SSL_USE_NSS // && !SSL_USE_CHANNEL && !SSL_USE_OPENSSL
|
| +
|
| +#include "nssstreamadapter.h"
|
| +
|
| +#endif // SSL_USE_OPENSSL && !SSL_USE_SCHANNEL && !SSL_USE_NSS
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| @@ -58,7 +62,21 @@
|
| return OpenSSLAdapter::CleanupSSL();
|
| }
|
|
|
| -#else // !SSL_USE_OPENSSL
|
| +#elif SSL_USE_NSS // !SSL_USE_OPENSSL
|
| +
|
| +bool InitializeSSL(VerificationCallback callback) {
|
| + return NSSContext::InitializeSSL(callback);
|
| +}
|
| +
|
| +bool InitializeSSLThread() {
|
| + return NSSContext::InitializeSSLThread();
|
| +}
|
| +
|
| +bool CleanupSSL() {
|
| + return NSSContext::CleanupSSL();
|
| +}
|
| +
|
| +#else // !SSL_USE_OPENSSL && !SSL_USE_NSS
|
|
|
| bool InitializeSSL(VerificationCallback callback) {
|
| return true;
|
| @@ -72,7 +90,7 @@
|
| return true;
|
| }
|
|
|
| -#endif // !SSL_USE_OPENSSL
|
| +#endif // !SSL_USE_OPENSSL && !SSL_USE_NSS
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
|
|