From c1cecd93e8ee9b8f82eb8dd7e752b256b5a9caf8 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Mon, 23 Jan 2023 12:17:58 +0000 Subject: Move bn_mul_add_words() and bn_mul_words() from bn_asm.c to bn_mul.c. These are wrapped with #ifndef HAVE_BN_ADD_MUL_WORDS/HAVE_BN_MUL_WORDS, which are defined for architectures that provide their own assembly versions. --- src/lib/libcrypto/bn/arch/amd64/bn_arch.h | 4 +++- src/lib/libcrypto/bn/arch/i386/bn_arch.h | 4 +++- src/lib/libcrypto/bn/arch/mips64/bn_arch.h | 4 +++- src/lib/libcrypto/bn/arch/powerpc/bn_arch.h | 4 +++- src/lib/libcrypto/bn/arch/sparc/bn_arch.h | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) (limited to 'src/lib/libcrypto/bn/arch') diff --git a/src/lib/libcrypto/bn/arch/amd64/bn_arch.h b/src/lib/libcrypto/bn/arch/amd64/bn_arch.h index e8c9986bb3..065f6b1c3b 100644 --- a/src/lib/libcrypto/bn/arch/amd64/bn_arch.h +++ b/src/lib/libcrypto/bn/arch/amd64/bn_arch.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_arch.h,v 1.6 2023/01/23 12:09:06 jsing Exp $ */ +/* $OpenBSD: bn_arch.h,v 1.7 2023/01/23 12:17:57 jsing Exp $ */ /* * Copyright (c) 2023 Joel Sing * @@ -24,8 +24,10 @@ #define HAVE_BN_DIV_WORDS +#define HAVE_BN_MUL_ADD_WORDS #define HAVE_BN_MUL_COMBA4 #define HAVE_BN_MUL_COMBA8 +#define HAVE_BN_MUL_WORDS #define HAVE_BN_SQR #define HAVE_BN_SQR_COMBA4 diff --git a/src/lib/libcrypto/bn/arch/i386/bn_arch.h b/src/lib/libcrypto/bn/arch/i386/bn_arch.h index eeb273583a..681c2090a7 100644 --- a/src/lib/libcrypto/bn/arch/i386/bn_arch.h +++ b/src/lib/libcrypto/bn/arch/i386/bn_arch.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_arch.h,v 1.5 2023/01/23 12:09:06 jsing Exp $ */ +/* $OpenBSD: bn_arch.h,v 1.6 2023/01/23 12:17:57 jsing Exp $ */ /* * Copyright (c) 2023 Joel Sing * @@ -24,8 +24,10 @@ #define HAVE_BN_DIV_WORDS +#define HAVE_BN_MUL_ADD_WORDS #define HAVE_BN_MUL_COMBA4 #define HAVE_BN_MUL_COMBA8 +#define HAVE_BN_MUL_WORDS #define HAVE_BN_SQR_COMBA4 #define HAVE_BN_SQR_COMBA8 diff --git a/src/lib/libcrypto/bn/arch/mips64/bn_arch.h b/src/lib/libcrypto/bn/arch/mips64/bn_arch.h index f7676611d7..53771bce1e 100644 --- a/src/lib/libcrypto/bn/arch/mips64/bn_arch.h +++ b/src/lib/libcrypto/bn/arch/mips64/bn_arch.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_arch.h,v 1.6 2023/01/23 12:09:06 jsing Exp $ */ +/* $OpenBSD: bn_arch.h,v 1.7 2023/01/23 12:17:58 jsing Exp $ */ /* * Copyright (c) 2023 Joel Sing * @@ -25,8 +25,10 @@ #define HAVE_BN_DIV_WORDS #define HAVE_BN_DIV_3_WORDS +#define HAVE_BN_MUL_ADD_WORDS #define HAVE_BN_MUL_COMBA4 #define HAVE_BN_MUL_COMBA8 +#define HAVE_BN_MUL_WORDS #define HAVE_BN_SQR_COMBA4 #define HAVE_BN_SQR_COMBA8 diff --git a/src/lib/libcrypto/bn/arch/powerpc/bn_arch.h b/src/lib/libcrypto/bn/arch/powerpc/bn_arch.h index eeb273583a..46e932a2d5 100644 --- a/src/lib/libcrypto/bn/arch/powerpc/bn_arch.h +++ b/src/lib/libcrypto/bn/arch/powerpc/bn_arch.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_arch.h,v 1.5 2023/01/23 12:09:06 jsing Exp $ */ +/* $OpenBSD: bn_arch.h,v 1.6 2023/01/23 12:17:58 jsing Exp $ */ /* * Copyright (c) 2023 Joel Sing * @@ -24,8 +24,10 @@ #define HAVE_BN_DIV_WORDS +#define HAVE_BN_MUL_ADD_WORDS #define HAVE_BN_MUL_COMBA4 #define HAVE_BN_MUL_COMBA8 +#define HAVE_BN_MUL_WORDS #define HAVE_BN_SQR_COMBA4 #define HAVE_BN_SQR_COMBA8 diff --git a/src/lib/libcrypto/bn/arch/sparc/bn_arch.h b/src/lib/libcrypto/bn/arch/sparc/bn_arch.h index eeb273583a..46e932a2d5 100644 --- a/src/lib/libcrypto/bn/arch/sparc/bn_arch.h +++ b/src/lib/libcrypto/bn/arch/sparc/bn_arch.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_arch.h,v 1.5 2023/01/23 12:09:06 jsing Exp $ */ +/* $OpenBSD: bn_arch.h,v 1.6 2023/01/23 12:17:58 jsing Exp $ */ /* * Copyright (c) 2023 Joel Sing * @@ -24,8 +24,10 @@ #define HAVE_BN_DIV_WORDS +#define HAVE_BN_MUL_ADD_WORDS #define HAVE_BN_MUL_COMBA4 #define HAVE_BN_MUL_COMBA8 +#define HAVE_BN_MUL_WORDS #define HAVE_BN_SQR_COMBA4 #define HAVE_BN_SQR_COMBA8 -- cgit v1.2.3-55-g6feb