diff options
| author | mallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 08:38:04 +0000 |
|---|---|---|
| committer | mallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 08:38:04 +0000 |
| commit | 8c0b69c0eb8c69b54c03c3dc36785a2ea6ee1842 (patch) | |
| tree | 604ecc516e00d063d095e7066540daa31c3772b2 /third_party | |
| parent | 723d50aeff54c973ab5e08f853968fcc5673ff55 (diff) | |
| download | chromium_src-8c0b69c0eb8c69b54c03c3dc36785a2ea6ee1842.zip chromium_src-8c0b69c0eb8c69b54c03c3dc36785a2ea6ee1842.tar.gz chromium_src-8c0b69c0eb8c69b54c03c3dc36785a2ea6ee1842.tar.bz2 | |
Roll libjingle r219
Review URL: https://chromiumcodereview.appspot.com/11320019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 4711d1d..1eb6042 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -2,7 +2,7 @@ Name: Libjingle library. Used for p2p voice and video communication. Short Name: libjingle URL: http://code.google.com/p/libjingle/ Version: unknown -Revision: 210 +Revision: 219 License: BSD License File: source/COPYING Security Critical: yes diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index bbc6454..63817d8 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -138,7 +138,7 @@ 'conditions': [ ['use_openssl!=1', { 'defines': [ - 'SSL_USE_NSS', + 'SSL_USE_NSS_RNG', ], 'conditions': [ ['os_posix == 1 and OS != "mac" and OS != "ios" and ' @@ -276,6 +276,10 @@ '<@(libjingle_source)/talk/base/network.cc', '<@(libjingle_source)/talk/base/network.h', '<@(libjingle_source)/talk/base/nullsocketserver.h', + '<@(libjingle_source)/talk/base/nssidentity.cc', + '<@(libjingle_source)/talk/base/nssidentity.h', + '<@(libjingle_source)/talk/base/nssstreamadapter.cc', + '<@(libjingle_source)/talk/base/nssstreamadapter.h', '<@(libjingle_source)/talk/base/pathutils.cc', '<@(libjingle_source)/talk/base/pathutils.h', '<@(libjingle_source)/talk/base/physicalsocketserver.cc', @@ -316,6 +320,8 @@ '<@(libjingle_source)/talk/base/sslsocketfactory.h', '<@(libjingle_source)/talk/base/sslstreamadapter.cc', '<@(libjingle_source)/talk/base/sslstreamadapter.h', + '<@(libjingle_source)/talk/base/sslstreamadapterhelper.cc', + '<@(libjingle_source)/talk/base/sslstreamadapterhelper.h', '<@(libjingle_source)/talk/base/stream.cc', '<@(libjingle_source)/talk/base/stream.h', '<@(libjingle_source)/talk/base/stringencode.cc', |