Updated usrsctp to fix various issues for windows (using changes pushed upstream) and unified SHA1 …

third_party/usrsctp/localchanges.patch

Index: third_party/usrsctp/localchanges.patch
diff --git a/third_party/usrsctp/localchanges.patch b/third_party/usrsctp/localchanges.patch
index b784a428143ca04071e7c9e51260a79aeb5b447a..83029a8cbe70ed4766c95b5467aa42b475a376cb 100644
--- a/third_party/usrsctp/localchanges.patch
+++ b/third_party/usrsctp/localchanges.patch
@@ -1,6 +1,15 @@
-diff -NcrB usrsctplib/netinet/sctp_auth.h overrides/usrsctplib/netinet/sctp_auth.h
-*** usrsctplib/netinet/sctp_auth.h	2013-06-10 17:41:59.323347517 -0700
---- overrides/usrsctplib/netinet/sctp_auth.h	2013-06-10 17:44:55.584797436 -0700
+Binary files usrsctplib/.DS_Store and overrides/usrsctplib/.DS_Store differ
+Only in usrsctplib: .cvsignore
+Only in usrsctplib: .git
+Only in usrsctplib: Makefile.am
+Only in usrsctplib: Makefile.nmake
+Only in usrsctplib/netinet: sctp.h
+Only in usrsctplib/netinet: sctp_asconf.c
+Only in usrsctplib/netinet: sctp_asconf.h
+Only in usrsctplib/netinet: sctp_auth.c
+diff -PcrB usrsctplib/netinet/sctp_auth.h overrides/usrsctplib/netinet/sctp_auth.h
+*** usrsctplib/netinet/sctp_auth.h	2013-07-26 05:00:15.000000000 -0400
+--- overrides/usrsctplib/netinet/sctp_auth.h	2013-06-18 11:40:34.000000000 -0400
 ***************
 *** 38,43 ****
 --- 38,44 ----
@@ -11,12 +20,30 @@ diff -NcrB usrsctplib/netinet/sctp_auth.h overrides/usrsctplib/netinet/sctp_auth
   
   /* digest lengths */
   #define SCTP_AUTH_DIGEST_LEN_SHA1	20
-diff -NcrB usrsctplib/netinet/sctp_nss_sha1.c overrides/usrsctplib/netinet/sctp_nss_sha1.c
-*** usrsctplib/netinet/sctp_nss_sha1.c	1969-12-31 16:00:00.000000000 -0800
---- overrides/usrsctplib/netinet/sctp_nss_sha1.c	2013-06-10 17:41:29.603102743 -0700
+Only in usrsctplib/netinet: sctp_bsd_addr.c
+Only in usrsctplib/netinet: sctp_bsd_addr.h
+Only in usrsctplib/netinet: sctp_callout.c
+Only in usrsctplib/netinet: sctp_callout.h
+Only in usrsctplib/netinet: sctp_cc_functions.c
+Only in usrsctplib/netinet: sctp_constants.h
+Only in usrsctplib/netinet: sctp_crc32.c
+Only in usrsctplib/netinet: sctp_crc32.h
+Only in usrsctplib/netinet: sctp_dtrace_declare.h
+Only in usrsctplib/netinet: sctp_dtrace_define.h
+Only in usrsctplib/netinet: sctp_hashdriver.c
+Only in usrsctplib/netinet: sctp_hashdriver.h
+Only in usrsctplib/netinet: sctp_header.h
+Only in usrsctplib/netinet: sctp_indata.c
+Only in usrsctplib/netinet: sctp_indata.h
+Only in usrsctplib/netinet: sctp_input.c
+Only in usrsctplib/netinet: sctp_input.h
+Only in usrsctplib/netinet: sctp_lock_userspace.h
+diff -PcrB usrsctplib/netinet/sctp_nss_sha1.c overrides/usrsctplib/netinet/sctp_nss_sha1.c
+*** usrsctplib/netinet/sctp_nss_sha1.c	1969-12-31 19:00:00.000000000 -0500
+--- overrides/usrsctplib/netinet/sctp_nss_sha1.c	2013-07-29 21:32:35.000000000 -0400
 ***************
 *** 0 ****
---- 1,61 ----
+--- 1,64 ----
 + /*-
 +  * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
 +  * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
@@ -57,6 +84,9 @@ diff -NcrB usrsctplib/netinet/sctp_nss_sha1.c overrides/usrsctplib/netinet/sctp_
 + #ifdef SCTP_USE_NSS_SHA1
 + #include <netinet/sctp_nss_sha1.h>
 + 
++ /* A SHA-1 Digest is 160 bits, or 20 bytes */
++ #define SHA_DIGEST_LENGTH (20)
++ 
 + void
 + SCTP_NSS_SHA1_Init(struct sha1_context *ctx)
 + {
@@ -74,13 +104,13 @@ diff -NcrB usrsctplib/netinet/sctp_nss_sha1.c overrides/usrsctplib/netinet/sctp_
 + SCTP_NSS_SHA1_Final(unsigned char *digest, struct sha1_context *ctx)
 + {
 + 	unsigned int output_len = 0;
-+ 	PK11_DigestFinal(ctx->pk11_ctx, digest, &output_len, sizeof(digest));
++ 	PK11_DigestFinal(ctx->pk11_ctx, digest, &output_len, SHA_DIGEST_LENGTH);
 + 	PK11_DestroyContext(ctx->pk11_ctx, PR_TRUE);
 + }
 + #endif
-diff -NcrB usrsctplib/netinet/sctp_nss_sha1.h overrides/usrsctplib/netinet/sctp_nss_sha1.h
-*** usrsctplib/netinet/sctp_nss_sha1.h	1969-12-31 16:00:00.000000000 -0800
---- overrides/usrsctplib/netinet/sctp_nss_sha1.h	2013-06-10 17:41:29.603102743 -0700
+diff -PcrB usrsctplib/netinet/sctp_nss_sha1.h overrides/usrsctplib/netinet/sctp_nss_sha1.h
+*** usrsctplib/netinet/sctp_nss_sha1.h	1969-12-31 19:00:00.000000000 -0500
+--- overrides/usrsctplib/netinet/sctp_nss_sha1.h	2013-07-26 03:58:48.000000000 -0400
 ***************
 *** 0 ****
 --- 1,64 ----
@@ -146,11 +176,11 @@ diff -NcrB usrsctplib/netinet/sctp_nss_sha1.h overrides/usrsctplib/netinet/sctp_
 + #define SHA1_Update SCTP_NSS_SHA1_Update
 + #define SHA1_Final SCTP_NSS_SHA1_Final
 + 
-+ #endif				/* _KERNEL */
-+ #endif
-diff -NcrB usrsctplib/netinet/sctp_openssl_sha1.h overrides/usrsctplib/netinet/sctp_openssl_sha1.h
-*** usrsctplib/netinet/sctp_openssl_sha1.h	1969-12-31 16:00:00.000000000 -0800
---- overrides/usrsctplib/netinet/sctp_openssl_sha1.h	2013-06-10 17:41:29.603102743 -0700
++ #endif  /* _KERNEL */
++ #endif  /* __SCTP_NSS_SHA1_h__ */
+diff -PcrB usrsctplib/netinet/sctp_openssl_sha1.h overrides/usrsctplib/netinet/sctp_openssl_sha1.h
+*** usrsctplib/netinet/sctp_openssl_sha1.h	1969-12-31 19:00:00.000000000 -0500
+--- overrides/usrsctplib/netinet/sctp_openssl_sha1.h	2013-06-18 11:40:34.000000000 -0400
 ***************
 *** 0 ****
 --- 1,48 ----
@@ -202,9 +232,9 @@ diff -NcrB usrsctplib/netinet/sctp_openssl_sha1.h overrides/usrsctplib/netinet/s
 + typedef SHA_CTX SHA1_CTX;
 + 
 + #endif
-diff -NcrB usrsctplib/netinet/sctp_os.h overrides/usrsctplib/netinet/sctp_os.h
-*** usrsctplib/netinet/sctp_os.h	2013-06-10 17:42:10.643440747 -0700
---- overrides/usrsctplib/netinet/sctp_os.h	2013-06-10 17:41:29.603102743 -0700
+diff -PcrB usrsctplib/netinet/sctp_os.h overrides/usrsctplib/netinet/sctp_os.h
+*** usrsctplib/netinet/sctp_os.h	2013-07-26 05:00:15.000000000 -0400
+--- overrides/usrsctplib/netinet/sctp_os.h	2013-06-18 11:40:34.000000000 -0400
 ***************
 *** 73,79 ****
   #endif
@@ -223,34 +253,48 @@ diff -NcrB usrsctplib/netinet/sctp_os.h overrides/usrsctplib/netinet/sctp_os.h
   #endif
   
   #if defined(__Panda__)
-diff -NcrB usrsctplib/netinet/sctp_os_userspace.h overrides/usrsctplib/netinet/sctp_os_userspace.h
-*** usrsctplib/netinet/sctp_os_userspace.h	2013-06-10 17:42:23.763548800 -0700
---- overrides/usrsctplib/netinet/sctp_os_userspace.h	2013-06-10 17:41:29.603102743 -0700
+diff -PcrB usrsctplib/netinet/sctp_os_userspace.h overrides/usrsctplib/netinet/sctp_os_userspace.h
+*** usrsctplib/netinet/sctp_os_userspace.h	2013-07-26 05:03:12.000000000 -0400
+--- overrides/usrsctplib/netinet/sctp_os_userspace.h	2013-07-26 04:46:41.000000000 -0400
 ***************
-*** 992,1000 ****
+*** 996,1012 ****
   #define SCTP_READ_RANDOM(buf, len)	read_random(buf, len)
   
   
 - #ifdef USE_SCTP_SHA1
   #include <netinet/sctp_sha1.h>
-- #else
-  #if 0 /*this was old _KERNEL code... */
-  #include <crypto/sha1.h>
-  /* map standard crypto API names */
---- 992,998 ----
-***************
-*** 1002,1008 ****
-  #define SHA1_Update	SHA1Update
-  #define SHA1_Final(x,y)	SHA1Final((caddr_t)x, y)
-  #endif
-- #endif
+! #else
+! #if 0 /*this was old _KERNEL code... */
+! #include <crypto/sha1.h>
+! /* map standard crypto API names */
+! #define SHA1_Init	SHA1Init
+! #define SHA1_Update	SHA1Update
+! #define SHA1_Final(x,y)	SHA1Final((caddr_t)x, y)
+! #endif
+! #endif
+  
+  #if defined(HAVE_SHA2)
+  #include <crypto/sha2/sha2.h>
+--- 996,1003 ----
+  #define SCTP_READ_RANDOM(buf, len)	read_random(buf, len)
+  
+  
+  #include <netinet/sctp_sha1.h>
+! 
   
   #if defined(HAVE_SHA2)
   #include <crypto/sha2/sha2.h>
---- 1000,1005 ----
-diff -NcrB usrsctplib/netinet/sctp_sha1.h overrides/usrsctplib/netinet/sctp_sha1.h
-*** usrsctplib/netinet/sctp_sha1.h	2013-06-10 17:42:32.483620614 -0700
---- overrides/usrsctplib/netinet/sctp_sha1.h	2013-06-10 17:41:29.603102743 -0700
+Only in usrsctplib/netinet: sctp_output.c
+Only in usrsctplib/netinet: sctp_output.h
+Only in usrsctplib/netinet: sctp_pcb.c
+Only in usrsctplib/netinet: sctp_pcb.h
+Only in usrsctplib/netinet: sctp_peeloff.c
+Only in usrsctplib/netinet: sctp_peeloff.h
+Only in usrsctplib/netinet: sctp_process_lock.h
+Only in usrsctplib/netinet: sctp_sha1.c
+diff -PcrB usrsctplib/netinet/sctp_sha1.h overrides/usrsctplib/netinet/sctp_sha1.h
+*** usrsctplib/netinet/sctp_sha1.h	2013-07-26 05:00:15.000000000 -0400
+--- overrides/usrsctplib/netinet/sctp_sha1.h	2013-07-29 23:00:51.000000000 -0400
 ***************
 *** 36,46 ****
   #endif
@@ -260,11 +304,11 @@ diff -NcrB usrsctplib/netinet/sctp_sha1.h overrides/usrsctplib/netinet/sctp_sha1
 ! #define __SCTP_SLA1_h__
   
   #include <sys/types.h>
-! 
+  
   struct sha1_context {
   	unsigned int A;
   	unsigned int B;
---- 36,50 ----
+--- 36,69 ----
   #endif
   
   
@@ -272,18 +316,73 @@ diff -NcrB usrsctplib/netinet/sctp_sha1.h overrides/usrsctplib/netinet/sctp_sha1
 ! #define __SCTP_SHA1_h__
   
   #include <sys/types.h>
-! #ifdef SCTP_USE_NSS_SHA1
-! #include <netinet/sctp_nss_sha1.h>
-! #elif SCTP_USE_OPENSSL_SHA1
-! #include <netinet/sctp_openssl_sha1.h>
-! #else  // USE_SCTP_SHA1
+  
++ #if !defined(SSL_USE_OPENSSL) && !defined(SSL_USE_NSS)
++ #if defined(WIN32)
++ 
++ #define SCTP_USE_SCTP_SHA1 1
++ 
++ #else  // defined(WIN32)
++ 
++ #if defined(HAVE_OPENSSL_SSL_H)
++ #define SSL_USE_OPENSSL 1
++ #elif defined(HAVE_NSS_SSL_H)
++ #define SSL_USE_NSS 1
++ #else
++ #define SCTP_USE_SCTP_SHA1
++ #endif
++ 
++ #endif  // !defined(WIN32)
++ #endif
++ 
++ #if defined(SSL_USE_NSS)
++ #include <netinet/sctp_nss_sha1.h>
++ #elif defined(SSL_USE_OPENSSL)
++ #include <netinet/sctp_openssl_sha1.h>
++ #else  // SCTP_USE_SCTP_SHA1
   struct sha1_context {
   	unsigned int A;
   	unsigned int B;
 ***************
-*** 96,98 ****
---- 100,103 ----
+*** 95,98 ****
+  void SHA1_Final(unsigned char *, struct sha1_context *);
   
   #endif				/* _KERNEL */
-  #endif
-+ #endif
+! #endif
+--- 118,122 ----
+  void SHA1_Final(unsigned char *, struct sha1_context *);
+  
+  #endif				/* _KERNEL */
+! #endif        /* !defined(SSL_USE_OPENSSL) && !defined(SSL_USE_NSS) */
+! #endif        /* __SCTP_SHA1_h__ */
+Only in usrsctplib/netinet: sctp_ss_functions.c
+Only in usrsctplib/netinet: sctp_structs.h
+Only in usrsctplib/netinet: sctp_sysctl.c
+Only in usrsctplib/netinet: sctp_sysctl.h
+Only in usrsctplib/netinet: sctp_timer.c
+Only in usrsctplib/netinet: sctp_timer.h
+Only in usrsctplib/netinet: sctp_uio.h
+Only in usrsctplib/netinet: sctp_userspace.c
+Only in usrsctplib/netinet: sctp_usrreq.c
+Only in usrsctplib/netinet: sctp_var.h
+Only in usrsctplib/netinet: sctputil.c
+Only in usrsctplib/netinet: sctputil.h
+Only in usrsctplib: netinet6
+Only in usrsctplib: user_atomic.h
+Only in usrsctplib: user_environment.c
+Only in usrsctplib: user_environment.h
+Only in usrsctplib: user_inpcb.h
+Only in usrsctplib: user_ip6_var.h
+Only in usrsctplib: user_ip_icmp.h
+Only in usrsctplib: user_malloc.h
+Only in usrsctplib: user_mbuf.c
+Only in usrsctplib: user_mbuf.h
+Only in usrsctplib: user_queue.h
+Only in usrsctplib: user_recv_thread.c
+Only in usrsctplib: user_recv_thread.h
+Only in usrsctplib: user_route.h
+Only in usrsctplib: user_sctp_timer_iterate.c
+Only in usrsctplib: user_socket.c
+Only in usrsctplib: user_socketvar.h
+Only in usrsctplib: user_uma.h
+Only in usrsctplib: usrsctp.h