[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  cfbb5fcf4424395a1a23751556ea12c56b80b57e (commit)
      from  59d3fd1cc8c938daa6384783a7e5847d6f5201f7 (commit)


- Log -----------------------------------------------------------------
commit cfbb5fcf4424395a1a23751556ea12c56b80b57e
Author: Tomas Mraz <tomas at openssl.org>
Date:   Thu Jan 13 18:07:08 2022 +0100

    bn_ppc.c: Fix build failure on AIX with XLC/XLCLANG
    
    These compilers define _ARCH_PPC64 for 32 bit builds
    so we cannot depend solely on this define to identify
    32 bit build.
    
    Fixes #17087
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17497)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bn/bn_ppc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/bn/bn_ppc.c b/crypto/bn/bn_ppc.c
index 05c0c4cb92..5424c25d47 100644
--- a/crypto/bn/bn_ppc.c
+++ b/crypto/bn/bn_ppc.c
@@ -40,7 +40,7 @@ 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 defined(_ARCH_PPC64) && !defined(__ILP32__)
     if (num == 6) {
         if (OPENSSL_ppccap_P & PPC_MADD300)
             return bn_mul_mont_300_fixed_n6(rp, ap, bp, np, n0, num);