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.

1 files changed, 1 insertions, 132 deletions

diff --git a/src/lib/libcrypto/bn/bn_asm.c b/src/lib/libcrypto/bn/bn_asm.c
index 143c939367..e2b584ee85 100644
--- a/src/lib/libcrypto/bn/bn_asm.c
+++ b/src/lib/libcrypto/bn/bn_asm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_asm.c,v 1.22 2023/01/23 12:09:06 jsing Exp $ */
+/* $OpenBSD: bn_asm.c,v 1.23 2023/01/23 12:17:57 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -63,137 +63,6 @@
 
 #include "bn_local.h"
 
-#if defined(BN_LLONG) || defined(BN_UMULT_HIGH)
-
-BN_ULONG
-bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w)
-{
-        BN_ULONG c1 = 0;
-
-        assert(num >= 0);
-        if (num <= 0)
-                return (c1);
-
-#ifndef OPENSSL_SMALL_FOOTPRINT
-        while (num & ~3) {
-                mul_add(rp[0], ap[0], w, c1);
-                mul_add(rp[1], ap[1], w, c1);
-                mul_add(rp[2], ap[2], w, c1);
-                mul_add(rp[3], ap[3], w, c1);
-                ap += 4;
-                rp += 4;
-                num -= 4;
-        }
-#endif
-        while (num) {
-                mul_add(rp[0], ap[0], w, c1);
-                ap++;
-                rp++;
-                num--;
-        }
-
-        return (c1);
-}
-
-BN_ULONG
-bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w)
-{
-        BN_ULONG c1 = 0;
-
-        assert(num >= 0);
-        if (num <= 0)
-                return (c1);
-
-#ifndef OPENSSL_SMALL_FOOTPRINT
-        while (num & ~3) {
-                mul(rp[0], ap[0], w, c1);
-                mul(rp[1], ap[1], w, c1);
-                mul(rp[2], ap[2], w, c1);
-                mul(rp[3], ap[3], w, c1);
-                ap += 4;
-                rp += 4;
-                num -= 4;
-        }
-#endif
-        while (num) {
-                mul(rp[0], ap[0], w, c1);
-                ap++;
-                rp++;
-                num--;
-        }
-        return (c1);
-}
-
-#else /* !(defined(BN_LLONG) || defined(BN_UMULT_HIGH)) */
-
-BN_ULONG
-bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w)
-{
-        BN_ULONG c = 0;
-        BN_ULONG bl, bh;
-
-        assert(num >= 0);
-        if (num <= 0)
-                return ((BN_ULONG)0);
-
-        bl = LBITS(w);
-        bh = HBITS(w);
-
-#ifndef OPENSSL_SMALL_FOOTPRINT
-        while (num & ~3) {
-                mul_add(rp[0], ap[0], bl, bh, c);
-                mul_add(rp[1], ap[1], bl, bh, c);
-                mul_add(rp[2], ap[2], bl, bh, c);
-                mul_add(rp[3], ap[3], bl, bh, c);
-                ap += 4;
-                rp += 4;
-                num -= 4;
-        }
-#endif
-        while (num) {
-                mul_add(rp[0], ap[0], bl, bh, c);
-                ap++;
-                rp++;
-                num--;
-        }
-        return (c);
-}
-
-BN_ULONG
-bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w)
-{
-        BN_ULONG carry = 0;
-        BN_ULONG bl, bh;
-
-        assert(num >= 0);
-        if (num <= 0)
-                return ((BN_ULONG)0);
-
-        bl = LBITS(w);
-        bh = HBITS(w);
-
-#ifndef OPENSSL_SMALL_FOOTPRINT
-        while (num & ~3) {
-                mul(rp[0], ap[0], bl, bh, carry);
-                mul(rp[1], ap[1], bl, bh, carry);
-                mul(rp[2], ap[2], bl, bh, carry);
-                mul(rp[3], ap[3], bl, bh, carry);
-                ap += 4;
-                rp += 4;
-                num -= 4;
-        }
-#endif
-        while (num) {
-                mul(rp[0], ap[0], bl, bh, carry);
-                ap++;
-                rp++;
-                num--;
-        }
-        return (carry);
-}
-
-#endif /* !(defined(BN_LLONG) || defined(BN_UMULT_HIGH)) */
-
 #if defined(BN_MUL_COMBA) && !defined(OPENSSL_SMALL_FOOTPRINT)
 
 #ifdef OPENSSL_NO_ASM