From 47510f0e18d97040cb705273bf0efc640935c92f Mon Sep 17 00:00:00 2001 From: jsing <> Date: Tue, 31 Jan 2023 06:17:11 +0000 Subject: Remove the now empty bn_asm.c. This rather misnamed file (bn_asm.c) previously contained the C code that was needed to build libcrypto bignum on platforms that did not have assembly implementations of the functions it contained. --- src/lib/libcrypto/Makefile | 3 +- src/lib/libcrypto/arch/aarch64/Makefile.inc | 3 +- src/lib/libcrypto/arch/alpha/Makefile.inc | 3 +- src/lib/libcrypto/arch/arm/Makefile.inc | 1 - src/lib/libcrypto/arch/hppa/Makefile.inc | 3 +- src/lib/libcrypto/arch/powerpc64/Makefile.inc | 3 +- src/lib/libcrypto/arch/sparc64/Makefile.inc | 3 +- src/lib/libcrypto/bn/bn_asm.c | 65 --------------------------- 8 files changed, 6 insertions(+), 78 deletions(-) delete mode 100644 src/lib/libcrypto/bn/bn_asm.c (limited to 'src') diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile index 1858fa7ab2..c098b2229c 100644 --- a/src/lib/libcrypto/Makefile +++ b/src/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.95 2023/01/29 14:06:58 jsing Exp $ +# $OpenBSD: Makefile,v 1.96 2023/01/31 06:17:10 jsing Exp $ LIB= crypto LIBREBUILD=y @@ -910,7 +910,6 @@ obj_dat.h: obj_mac.h ${SSL_OBJECTS}/obj_dat.pl CFLAGS+=-DOPENSSL_NO_ASM SRCS+= aes_core.c aes_cbc.c SRCS+= bf_enc.c -SRCS+= bn_asm.c SRCS+= camellia.c cmll_cbc.c cmll_misc.c SRCS+= des_enc.c fcrypt_b.c SRCS+= rc4_enc.c rc4_skey.c diff --git a/src/lib/libcrypto/arch/aarch64/Makefile.inc b/src/lib/libcrypto/arch/aarch64/Makefile.inc index 48a340a6a2..b953494234 100644 --- a/src/lib/libcrypto/arch/aarch64/Makefile.inc +++ b/src/lib/libcrypto/arch/aarch64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 2022/03/23 15:13:31 tb Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2023/01/31 06:17:10 jsing Exp $ # aarch64-specific libcrypto build rules @@ -7,7 +7,6 @@ SRCS+= aes_core.c aes_cbc.c # bf SRCS+= bf_enc.c # bn -SRCS+= bn_asm.c # camellia SRCS+= camellia.c cmll_cbc.c cmll_misc.c # des diff --git a/src/lib/libcrypto/arch/alpha/Makefile.inc b/src/lib/libcrypto/arch/alpha/Makefile.inc index 9d1eab835c..4cdcf64e0b 100644 --- a/src/lib/libcrypto/arch/alpha/Makefile.inc +++ b/src/lib/libcrypto/arch/alpha/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2023/01/17 15:04:27 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2023/01/31 06:17:10 jsing Exp $ # alpha-specific libcrypto build rules @@ -7,7 +7,6 @@ SRCS+= aes_core.c aes_cbc.c # bf SRCS+= bf_enc.c # bn -SRCS+= bn_asm.c SSLASM+= bn alpha-mont CFLAGS+= -DOPENSSL_BN_ASM_MONT # camellia diff --git a/src/lib/libcrypto/arch/arm/Makefile.inc b/src/lib/libcrypto/arch/arm/Makefile.inc index 18772332be..c4e47c2dab 100644 --- a/src/lib/libcrypto/arch/arm/Makefile.inc +++ b/src/lib/libcrypto/arch/arm/Makefile.inc @@ -9,7 +9,6 @@ SSLASM+= aes aes-armv4 # bf SRCS+= bf_enc.c # bn -SRCS+= bn_asm.c CFLAGS+= -DOPENSSL_BN_ASM_MONT SSLASM+= bn armv4-mont CFLAGS+= -DOPENSSL_BN_ASM_GF2m diff --git a/src/lib/libcrypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/arch/hppa/Makefile.inc index 76affc391d..c11b899440 100644 --- a/src/lib/libcrypto/arch/hppa/Makefile.inc +++ b/src/lib/libcrypto/arch/hppa/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.13 2023/01/17 15:04:27 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.14 2023/01/31 06:17:10 jsing Exp $ # hppa-specific libcrypto build rules @@ -9,7 +9,6 @@ SSLASM+= aes aes-parisc aes-parisc # bf SRCS+= bf_enc.c # bn -SRCS+= bn_asm.c SSLASM+= bn parisc-mont parisc-mont CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W # camellia diff --git a/src/lib/libcrypto/arch/powerpc64/Makefile.inc b/src/lib/libcrypto/arch/powerpc64/Makefile.inc index 51e1c569dc..fe19069ee0 100644 --- a/src/lib/libcrypto/arch/powerpc64/Makefile.inc +++ b/src/lib/libcrypto/arch/powerpc64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2023/01/17 15:04:27 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2023/01/31 06:17:10 jsing Exp $ # powerpc-specific libcrypto build rules @@ -10,7 +10,6 @@ SRCS+= aes_core.c aes_cbc.c # bf SRCS+= bf_enc.c # bn -SRCS+= bn_asm.c #SSLASM+= bn ppc bn-ppc #SSLASM+= bn ppc-mont ppc-mont # bn_mul_mont_int #SSLASM+= bn ppc64-mont ppc64-mont # bn_mul_mont_fpu64 diff --git a/src/lib/libcrypto/arch/sparc64/Makefile.inc b/src/lib/libcrypto/arch/sparc64/Makefile.inc index 6ea1409c44..1b149ffb4e 100644 --- a/src/lib/libcrypto/arch/sparc64/Makefile.inc +++ b/src/lib/libcrypto/arch/sparc64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.7 2023/01/14 15:45:43 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2023/01/31 06:17:10 jsing Exp $ # sparc64-specific libcrypto build rules @@ -9,7 +9,6 @@ SSLASM+= aes aes-sparcv9 aes-sparcv9 # bf SRCS+= bf_enc.c # bn -SRCS+= bn_asm.c # camellia SRCS+= camellia.c cmll_cbc.c cmll_misc.c # des diff --git a/src/lib/libcrypto/bn/bn_asm.c b/src/lib/libcrypto/bn/bn_asm.c deleted file mode 100644 index bfdeabd9eb..0000000000 --- a/src/lib/libcrypto/bn/bn_asm.c +++ /dev/null @@ -1,65 +0,0 @@ -/* $OpenBSD: bn_asm.c,v 1.24 2023/01/28 17:07:02 jsing Exp $ */ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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 acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include -#include - -#include - -#include "bn_local.h" - -- cgit v1.2.3-55-g6feb