Updated usrsctp to fix various issues for windows (using changes pushed upstream) and unified SHA1 treatment with libjingle.

Note: HAVE_SCTP is still currently turned off for windows (while investigating an apparent issue in win xp)

(patch from issue 19522005; exactly the same, except HAVE_SCTP is not turned on for windows)

BUG=

Review URL: https://chromiumcodereview.appspot.com/21968004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215983 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 29 deletions

diff --git a/third_party/usrsctp/usrsctp.gyp b/third_party/usrsctp/usrsctp.gyp
index 9285e21..d273385 100644
--- a/third_party/usrsctp/usrsctp.gyp
+++ b/third_party/usrsctp/usrsctp.gyp
@@ -7,7 +7,6 @@
   },
   'target_defaults': {
     'defines': [
-      'INET',
       'SCTP_PROCESS_LEVEL_LOCKS',
       'SCTP_SIMPLE_ALLOCATOR',
       '__Userspace__',
@@ -32,19 +31,27 @@
     'conditions': [
       ['use_openssl==1', {
         'defines': [
-          'SCTP_USE_OPENSSL_SHA1',
+          'SSL_USE_OPENSSL',
         ],
         'dependencies': [
-          '../../third_party/openssl/openssl.gyp:openssl',
+          '<(DEPTH)/third_party/openssl/openssl.gyp:openssl',
+        ],
+        'sources': [
+          'overrides/usrsctplib/netinet/sctp_openssl_sha1.h',
         ],
       },
       {  # else use_openssl==0, use NSS.
         'defines' : [
+          'SSL_USE_NSS',
           'SCTP_USE_NSS_SHA1',
         ],
+        'sources': [
+          'overrides/usrsctplib/netinet/sctp_nss_sha1.c',
+          'overrides/usrsctplib/netinet/sctp_nss_sha1.h',
+        ],
         'conditions': [
           ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
-            'dependencies': [
+            'dependencies': [  # The system.gyp:ssl dependency includes nss
               '<(DEPTH)/build/linux/system.gyp:ssl',
             ],
           }],
@@ -66,9 +73,7 @@
         'overrides/usrsctplib/netinet/sctp_auth.h',
         'overrides/usrsctplib/netinet/sctp_os.h',
         'overrides/usrsctplib/netinet/sctp_os_userspace.h',
-        'overrides/usrsctplib/netinet/sctp_nss_sha1.c',
-        'overrides/usrsctplib/netinet/sctp_nss_sha1.h',
-
+        'overrides/usrsctplib/netinet/sctp_sha1.h',
         'usrsctplib/usrsctp.h',
         'usrsctplib/user_atomic.h',
         'usrsctplib/user_environment.c',
@@ -97,8 +102,6 @@
         'usrsctplib/netinet/sctp_constants.h',
         'usrsctplib/netinet/sctp_crc32.c',
         'usrsctplib/netinet/sctp_crc32.h',
-        'usrsctplib/netinet/sctp_hashdriver.h',
-        'usrsctplib/netinet/sctp_hashdriver.c',
         'usrsctplib/netinet/sctp_header.h',
         'usrsctplib/netinet/sctp_indata.c',
         'usrsctplib/netinet/sctp_indata.h',
@@ -123,23 +126,10 @@
         'usrsctplib/netinet/sctputil.c',
         'usrsctplib/netinet/sctputil.h',
         'usrsctplib/netinet/sctp_var.h',
-        'usrsctplib/netinet6/sctp6_usrreq.c',
-        'usrsctplib/netinet6/sctp6_var.h',
       ],  # sources
       'conditions': [
-        ['use_openssl==1', {
-          'sources!': [
-            'overrides/usrsctplib/netinet/sctp_nss_sha1.c',
-            'overrides/usrsctplib/netinet/sctp_nss_sha1.h',
-          ],
-          'sources': [
-            'overrides/usrsctplib/netinet/sctp_openssl_sha1.h',
-          ],
-        }],
         ['OS=="linux"', {
           'defines': [
-            'HAVE_INET_ADDR',
-            'HAVE_SOCKET',
             '__Userspace_os_Linux',
           ],
           'cflags!': [ '-Werror', '-Wall' ],
@@ -147,13 +137,8 @@
         }],
         ['OS=="mac"', {
           'defines': [
-            'HAVE_INET_ADDR',
             'HAVE_SA_LEN',
             'HAVE_SCONN_LEN',
-            'HAVE_SIN6_LEN',
-            'HAVE_SIN_LEN',
-            'HAVE_SOCKET',
-            'INET6',
             '__APPLE_USE_RFC_2292',
             '__Userspace_os_Darwin',
           ],
@@ -165,12 +150,12 @@
         }],
         ['OS=="win"', {
           'defines': [
-            'INET6',
             '__Userspace_os_Windows',
           ],
           'cflags!': [ '/W3', '/WX' ],
           'cflags': [ '/w' ],
-          # TODO(ldixon) : Remove this disable.
+          # TODO(ldixon) : Remove this disabling of warnings by pushing a
+          # fix upstream to usrsctp
           'msvs_disabled_warnings': [ 4700, 4013, 4018, 4133, 4267 ],
         }, {  # OS != "win",
           'defines': [