From a9bac59217249b4a262676ea40d8eb2e2535cdbd Mon Sep 17 00:00:00 2001 From: jsing <> Date: Sun, 13 Sep 2015 12:13:02 +0000 Subject: Nuke openssl/e_os2.h, since nothing should be using it. ok deraadt@ "hurray! finally!" miod@ "Yay!" sthen@ --- src/lib/libcrypto/crypto/Makefile | 3 +- src/lib/libssl/src/e_os2.h | 84 --------------------------------------- 2 files changed, 1 insertion(+), 86 deletions(-) delete mode 100644 src/lib/libssl/src/e_os2.h diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile index 9eccb901cd..45373165b1 100644 --- a/src/lib/libcrypto/crypto/Makefile +++ b/src/lib/libcrypto/crypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.60 2015/07/19 22:34:27 doug Exp $ +# $OpenBSD: Makefile,v 1.61 2015/09/13 12:13:02 jsing Exp $ LIB= crypto @@ -312,7 +312,6 @@ SRCS+= pcy_cache.c pcy_node.c pcy_data.c pcy_map.c pcy_tree.c pcy_lib.c ${LCRYPTO_SRC}/x509v3 HDRS=\ - e_os2.h \ crypto/aes/aes.h \ crypto/asn1/asn1.h \ crypto/asn1/asn1_mac.h \ diff --git a/src/lib/libssl/src/e_os2.h b/src/lib/libssl/src/e_os2.h deleted file mode 100644 index ea73c480d9..0000000000 --- a/src/lib/libssl/src/e_os2.h +++ /dev/null @@ -1,84 +0,0 @@ -/* $OpenBSD: e_os2.h,v 1.20 2015/01/26 13:46:23 jsing Exp $ */ -/* ==================================================================== - * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. 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. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED 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 OpenSSL PROJECT OR - * ITS 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. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - -#ifndef HEADER_E_OS2_H -#define HEADER_E_OS2_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef LIBRESSL_INTERNAL - -#define OPENSSL_SYS_UNIX - -#define OPENSSL_EXPORT extern -#define OPENSSL_IMPORT extern -#define OPENSSL_GLOBAL -#define OPENSSL_EXTERN OPENSSL_IMPORT - -#define OPENSSL_IMPLEMENT_GLOBAL(type,name,value) \ - OPENSSL_GLOBAL type _shadow_##name=value; -#define OPENSSL_DECLARE_GLOBAL(type,name) OPENSSL_EXPORT type _shadow_##name -#define OPENSSL_GLOBAL_REF(name) _shadow_##name - -#endif - -#ifdef __cplusplus -} -#endif -#endif -- cgit v1.2.3-55-g6feb