[openssl] master update

tomas at openssl.org tomas at openssl.org
Tue Jan 4 12:09:06 UTC 2022


The branch master has been updated
       via  a8251a32a0dc449fc39f44a1768e091fcc077227 (commit)
      from  04e3ab64d58bb43efc4392d12c607bb4b5a2c562 (commit)


- Log -----------------------------------------------------------------
commit a8251a32a0dc449fc39f44a1768e091fcc077227
Author: fangming.fang <fangming.fang at arm.com>
Date:   Wed Dec 29 05:09:07 2021 +0000

    Fix compile error when building with no-asm
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17376)

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

Summary of changes:
 test/rdcpu_sanitytest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/rdcpu_sanitytest.c b/test/rdcpu_sanitytest.c
index df1858ae9b..08af5b0895 100644
--- a/test/rdcpu_sanitytest.c
+++ b/test/rdcpu_sanitytest.c
@@ -23,7 +23,7 @@ size_t OPENSSL_ia32_rdseed_bytes(unsigned char *buf, size_t len);
 # define IS_X_86 0
 #endif
 
-#if defined(__aarch64__)
+#if defined(__aarch64__) && defined(OPENSSL_CPUID_OBJ)
 # define IS_AARCH_64 1
 # include "arm_arch.h"
 


More information about the openssl-commits mailing list