Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(962)

Unified Diff: third_party/usrsctp/overrides/usrsctplib/netinet/sctp_sha1.h

Issue 23960004: Updated usrsctp to latest version with fixes upstream. Fixed usrsctp gyp file; removed overides. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "updated to fix for mac building from upstream" Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/usrsctp/overrides/usrsctplib/netinet/sctp_sha1.h
diff --git a/third_party/usrsctp/overrides/usrsctplib/netinet/sctp_sha1.h b/third_party/usrsctp/overrides/usrsctplib/netinet/sctp_sha1.h
deleted file mode 100644
index 006e9209006e12be499c44368cefcb2811fb7e62..0000000000000000000000000000000000000000
--- a/third_party/usrsctp/overrides/usrsctplib/netinet/sctp_sha1.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * b) Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the distribution.
- *
- * c) Neither the name of Cisco Systems, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifdef __FreeBSD__
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-#endif
-
-
-#ifndef __SCTP_SHA1_h__
-#define __SCTP_SHA1_h__
-
-#include <sys/types.h>
-
-#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;
- unsigned int C;
- unsigned int D;
- unsigned int E;
- unsigned int H0;
- unsigned int H1;
- unsigned int H2;
- unsigned int H3;
- unsigned int H4;
- unsigned int words[80];
- unsigned int TEMP;
- /* block I am collecting to process */
- char sha_block[64];
- /* collected so far */
- int how_many_in_block;
- unsigned int running_total;
-};
-typedef struct sha1_context SHA1_CTX;
-
-#define F1(B,C,D) (((B & C) | ((~B) & D))) /* 0 <= t <= 19 */
-#define F2(B,C,D) (B ^ C ^ D) /* 20 <= t <= 39 */
-#define F3(B,C,D) ((B & C) | (B & D) | (C & D)) /* 40 <= t <= 59 */
-#define F4(B,C,D) (B ^ C ^ D) /* 600 <= t <= 79 */
-
-/* circular shift */
-#define CSHIFT(A,B) ((B << A) | (B >> (32-A)))
-
-#define K1 0x5a827999 /* 0 <= t <= 19 */
-#define K2 0x6ed9eba1 /* 20 <= t <= 39 */
-#define K3 0x8f1bbcdc /* 40 <= t <= 59 */
-#define K4 0xca62c1d6 /* 60 <= t <= 79 */
-
-#define H0INIT 0x67452301
-#define H1INIT 0xefcdab89
-#define H2INIT 0x98badcfe
-#define H3INIT 0x10325476
-#define H4INIT 0xc3d2e1f0
-
-
-#if (defined(__APPLE__) && defined(KERNEL))
-#ifndef _KERNEL
-#define _KERNEL
-#endif
-#endif
-
-#if defined(_KERNEL) || defined(__Userspace__)
-
-void SHA1_Init(struct sha1_context *);
-void SHA1_Update(struct sha1_context *, const unsigned char *, int);
-void SHA1_Final(unsigned char *, struct sha1_context *);
-
-#endif /* _KERNEL */
-#endif /* !defined(SSL_USE_OPENSSL) && !defined(SSL_USE_NSS) */
-#endif /* __SCTP_SHA1_h__ */
« no previous file with comments | « third_party/usrsctp/overrides/usrsctplib/netinet/sctp_os_userspace.h ('k') | third_party/usrsctp/usrsctp.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698