diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 22:51:10 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 22:51:10 +0000 |
| commit | ab46a7364e29d57f15a52d55aea880a6487d8513 (patch) | |
| tree | 52e40048f18de510ea05b9582f98c4e15b84d95b /third_party/libjingle | |
| parent | 7c92720881f46343cabf03e375eac27c2742409f (diff) | |
| download | chromium_src-ab46a7364e29d57f15a52d55aea880a6487d8513.zip chromium_src-ab46a7364e29d57f15a52d55aea880a6487d8513.tar.gz chromium_src-ab46a7364e29d57f15a52d55aea880a6487d8513.tar.bz2 | |
Turn off SSL on Linux and MacOS in libjingle.
Review URL: http://codereview.chromium.org/270011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjingle')
| -rw-r--r-- | third_party/libjingle/files/talk/base/ssladapter.cc | 7 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/third_party/libjingle/files/talk/base/ssladapter.cc b/third_party/libjingle/files/talk/base/ssladapter.cc index 68fe038..e03a183 100644 --- a/third_party/libjingle/files/talk/base/ssladapter.cc +++ b/third_party/libjingle/files/talk/base/ssladapter.cc @@ -31,7 +31,8 @@ #ifdef WIN32 #define SSL_USE_SCHANNEL 1 #else // !WIN32 -#define SSL_USE_OPENSSL 1 +// Turn off OpenSSL +//#define SSL_USE_OPENSSL 1 #endif // !WIN32 #endif @@ -82,7 +83,11 @@ namespace talk_base { SSLAdapter* SSLAdapter::Create(AsyncSocket* socket) { +#if SSL_USE_OPENSSL || SSL_USE_SCHANNEL return new DefaultSSLAdapter(socket); +#else + return NULL; +#endif } /////////////////////////////////////////////////////////////////////////////// diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 1326b52..c212c5e4 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -261,6 +261,11 @@ 'files/talk/base/winping.h', ], }], + ['OS=="linux"', { + 'sources': [ + 'files/talk/base/unixfilesystem.cc', + ], + }], ], }, ], |