openssl, bugfix: BIGNUM is processed incorrectly under WIN64.

fibjs · Feb 22, 2024 · 40ef4b4 · 40ef4b4
1 parent df605a5
commit 40ef4b4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/openssl/include/crypto/bn_conf.h b/openssl/include/crypto/bn_conf.h
@@ -22,13 +22,13 @@
 /* Should we define BN_DIV2W here? */
 
 /* Only one for the following should be defined */
-#if defined(__i386__) || defined(_M_IX86) || defined(__arm__)
-#undef SIXTY_FOUR_BIT_LONG
-#define THIRTY_TWO_BIT
+
+#ifdef _WIN64
+# define SIXTY_FOUR_BIT
+#elif defined(__i386__) || defined(_M_IX86) || defined(__arm__)
+# define THIRTY_TWO_BIT
 #else
-#define SIXTY_FOUR_BIT_LONG
-#undef THIRTY_TWO_BIT
+# define SIXTY_FOUR_BIT_LONG
 #endif
-#undef SIXTY_FOUR_BIT
 
 #endif
diff --git a/openssl/include/openssl/configuration.h b/openssl/include/openssl/configuration.h
@@ -157,16 +157,13 @@ extern "C" {
 # undef I386_ONLY
 
 # if !defined(OPENSSL_SYS_UEFI)
-#  if defined(__i386__) || defined(_M_IX86) || defined(__arm__)
-#    define BN_LLONG
-#    undef SIXTY_FOUR_BIT_LONG
-#    undef SIXTY_FOUR_BIT
-#    define THIRTY_TWO_BIT
+#  ifdef _WIN64
+#   define SIXTY_FOUR_BIT
+#  elif defined(__i386__) || defined(_M_IX86) || defined(__arm__)
+#   define BN_LLONG
+#   define THIRTY_TWO_BIT
 #  else
-#    undef BN_LLONG
-#    define SIXTY_FOUR_BIT_LONG
-#    undef SIXTY_FOUR_BIT
-#    undef THIRTY_TWO_BIT
+#   define SIXTY_FOUR_BIT_LONG
 #  endif
 # endif