Chromium Code Reviews

Unified Diff: third_party/usrsctp/overrides/usrsctplib/netinet/sctp_nss_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.
Jump to:
View side-by-side diff with in-line comments
Index: third_party/usrsctp/overrides/usrsctplib/netinet/sctp_nss_sha1.h
diff --git a/third_party/usrsctp/overrides/usrsctplib/netinet/sctp_nss_sha1.h b/third_party/usrsctp/overrides/usrsctplib/netinet/sctp_nss_sha1.h
deleted file mode 100644
index ba5844025a451ae75f5aee6fb8cb47fd097accab..0000000000000000000000000000000000000000
--- a/third_party/usrsctp/overrides/usrsctplib/netinet/sctp_nss_sha1.h
+++ /dev/null
@@ -1,64 +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_NSS_SHA1_h__
-#define __SCTP_NSS_SHA1_h__
-
-#ifdef __Userspace_os_Darwin
-#define __APPLE__
-#endif
-
-#include <sys/types.h>
-#include <pk11pub.h>
-
-#ifdef __Userspace_os_Darwin
-#undef __APPLE__
-#endif
-
-struct sha1_context {
- struct PK11Context *pk11_ctx;
-}; // Opaque structure.
-
-typedef struct sha1_context SHA1_CTX;
-
-#if defined(_KERNEL) || defined(__Userspace__)
-#define SHA1_Init SCTP_NSS_SHA1_Init
-#define SHA1_Update SCTP_NSS_SHA1_Update
-#define SHA1_Final SCTP_NSS_SHA1_Final
-
-#endif /* _KERNEL */
-#endif /* __SCTP_NSS_SHA1_h__ */

Powered by Google App Engine