Commit 8efe8dd3 authored by tkchin@chromium.org's avatar tkchin@chromium.org

Roll usrsctplib from 8875 to 8912.

webrtc bug 3211.

R=ronghuawu@chromium.org
BUG=

Review URL: https://codereview.chromium.org/376053002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282382 0039d316-1c4b-4281-b951-d872f2087c98
parent 98f4af27
...@@ -228,7 +228,7 @@ deps = { ...@@ -228,7 +228,7 @@ deps = {
"src/third_party/usrsctp/usrsctplib": "src/third_party/usrsctp/usrsctplib":
(Var("googlecode_url") % "sctp-refimpl") + (Var("googlecode_url") % "sctp-refimpl") +
"/trunk/KERN/usrsctp/usrsctplib@8875", "/trunk/KERN/usrsctp/usrsctplib@8912",
"src/third_party/libsrtp": "src/third_party/libsrtp":
"/trunk/deps/third_party/libsrtp@261337", "/trunk/deps/third_party/libsrtp@261337",
......
Name: usrsctp Name: usrsctp
URL: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp URL: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp
Version: 0 Version: 0
Date: 16 March 2013 Date: 8 July 2014
Revision: 8554 Revision: 8912
License: New BSD License License: New BSD License
License File: LICENSE License File: LICENSE
Security Critical: yes Security Critical: yes
...@@ -18,15 +18,3 @@ as well as updates and enhancements from the following Internet Drafts: ...@@ -18,15 +18,3 @@ as well as updates and enhancements from the following Internet Drafts:
draft-stewart-prsctp-00.txt draft-stewart-prsctp-00.txt
draft-stewart-tsvwg-sctpipv6-00.txt draft-stewart-tsvwg-sctpipv6-00.txt
draft-iyengar-sctp-cacc-00.txt draft-iyengar-sctp-cacc-00.txt
Local Modifications:
usrsctplib provides its own SHA1 implementations as part of the library. Since
chrome already has the support of both NSS and OPENSSL which already
implementats SHA1, Chromium will not include the SHA1 from usrsctplib.
Overrides folder has the necessary changes to strip the existing SHA1
implementation in usrsctplib and use OPENSSL or NSS implementation based on the
platform type.
To re-create the patch file run:
diff -PcrB usrsctplib overrides/usrsctplib > localchanges.patch
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
'cflags!': [ '-Werror', '-Wall' ], 'cflags!': [ '-Werror', '-Wall' ],
'cflags': [ '-w' ], 'cflags': [ '-w' ],
}], }],
['OS=="mac"', { ['OS=="mac" or OS=="ios"', {
'defines': [ 'defines': [
'HAVE_SA_LEN', 'HAVE_SA_LEN',
'HAVE_SCONN_LEN', 'HAVE_SCONN_LEN',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment