Changeset 87142 in vbox for trunk

Timestamp:

Dec 30, 2020 12:17:55 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

142048

Message:

openssl: Adjustments for bugref:9898

Location:

trunk/src/libs/openssl-1.1.1i

Files:

• Config.kmk (modified) (1 diff)
• include/crypto/bn_conf.h (modified) (2 diffs)
• include/openssl/opensslconf.h (modified) (2 diffs)

trunk/src/libs/openssl-1.1.1i/Config.kmk

@@ -224 +224 @@
         NOCRYPT
 endif
-if1of ($(KBUILD_TARGET_ARCH), x86 amd64)
+if1of ($(KBUILD_TARGET_ARCH), x86 amd64 arm64)
 TEMPLATE_LIBCRYPTO_DEFS += \
         L_ENDIAN

trunk/src/libs/openssl-1.1.1i/include/crypto/bn_conf.h

@@ -22 +22 @@
 
 /* Only one for the following should be defined */
-#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_SPARC64)
+#include <iprt/cdefs.h>
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_SPARC64) || defined(RT_ARCH_ARM64)
 # ifdef _MSC_VER
 #  undef SIXTY_FOUR_BIT_LONG
@@ -32 +33 @@
 #  undef THIRTY_TWO_BIT
 # endif
-#elif defined(RT_ARCH_X86) || defined(RT_ARCH_SPARC)
+#elif defined(RT_ARCH_X86) || defined(RT_ARCH_SPARC) || defined(RT_ARCH_ARM32)
 # undef SIXTY_FOUR_BIT_LONG
 # undef SIXTY_FOUR_BIT

trunk/src/libs/openssl-1.1.1i/include/openssl/opensslconf.h

@@ -246 +246 @@
 # undef BN_LLONG
 /* Only one for the following should be defined */
-# if defined(RT_ARCH_AMD64) || defined(RT_ARCH_SPARC64)
+# include <iprt/cdefs.h>
+# if defined(RT_ARCH_AMD64) || defined(RT_ARCH_SPARC64) || defined(RT_ARCH_ARM64)
 #  ifdef _MSC_VER
 #   undef SIXTY_FOUR_BIT_LONG
@@ -256 +257 @@
 #   undef THIRTY_TWO_BIT
 #  endif
-# elif defined(RT_ARCH_X86) || defined(RT_ARCH_SPARC)
+# elif defined(RT_ARCH_X86) || defined(RT_ARCH_SPARC) || defined(RT_ARCH_ARM32)
 #   undef SIXTY_FOUR_BIT_LONG
 #   undef SIXTY_FOUR_BIT