From: Martin Schwenke <martin@meltin.net>
Date: Thu, 1 Jul 2021 06:59:30 +0000 (+1000)
Subject: bn: Make fixed-length Montgomery Multiplication conditional on PPC64
X-Git-Tag: openssl-3.0.0-beta2~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1627a41f1db38c0e762cbbcb452a869924370561;p=thirdparty%2Fopenssl.git

bn: Make fixed-length Montgomery Multiplication conditional on PPC64

This code is currently unconditional even though build.info has:

  $BNASM_ppc64=$BNASM_ppc32 ppc64-mont-fixed.s

This causes a build failure on 32-bit systems.

Fixes #15923

Signed-off-by: Martin Schwenke <martin@meltin.net>

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15971)
---

diff --git a/crypto/bn/bn_ppc.c b/crypto/bn/bn_ppc.c
index 24b384acbd1..05c0c4cb925 100644
--- a/crypto/bn/bn_ppc.c
+++ b/crypto/bn/bn_ppc.c
@@ -40,12 +40,14 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
      * no opportunity to figure it out...
      */
 
+#if defined(_ARCH_PPC64)
     if (num == 6) {
         if (OPENSSL_ppccap_P & PPC_MADD300)
             return bn_mul_mont_300_fixed_n6(rp, ap, bp, np, n0, num);
         else
             return bn_mul_mont_fixed_n6(rp, ap, bp, np, n0, num);
     }
+#endif
 
     return bn_mul_mont_int(rp, ap, bp, np, n0, num);
 }