Land #940, avoid redefinition of OPENSSL_NO_ASM

libressl · Nov 8, 2023 · 258ba3f · 258ba3f
2 parents 88510a3 + 43cb91c
commit 258ba3f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -34,6 +34,7 @@ LibreSSL Portable Release Notes:
 	* Internal improvements
 	* Documentation improvements
 	* Testing and proactive security
+	  - Bug fixes and simplifications in the Wycheproof tests.
 	* Compatibility changes
 	  - Added ChaCha20 and chacha20 aliases for ChaCha.
 	* Bug fixes

diff --git a/patches/win32_amd64_bn_arch.h.patch b/patches/win32_amd64_bn_arch.h.patch
@@ -1,17 +1,19 @@
 --- crypto/bn/arch/amd64/bn_arch.h.orig	2023-02-27 04:43:12.257874699 -0600
 +++ crypto/bn/arch/amd64/bn_arch.h	2023-02-27 04:44:05.541873870 -0600
-@@ -20,6 +20,10 @@
+@@ -20,6 +20,12 @@
  #ifndef HEADER_BN_ARCH_H
  #define HEADER_BN_ARCH_H
 
 +#ifdef _WIN32
++#ifndef OPENSSL_NO_ASM
 +#define OPENSSL_NO_ASM
++#endif
 +#else
 +
  #ifndef OPENSSL_NO_ASM
 
  #define HAVE_BN_ADD
-@@ -85,6 +89,7 @@
+@@ -85,6 +91,7 @@
  	*out_r0 = r0;
  }
  #endif /* __GNUC__ */