aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--OPENBSD_BRANCH2
-rw-r--r--patches/win32_amd64_bn_arch.h.patch6
-rw-r--r--tests/CMakeLists.txt5
-rw-r--r--tests/Makefile.am5
4 files changed, 5 insertions, 13 deletions
diff --git a/OPENBSD_BRANCH b/OPENBSD_BRANCH
index 1f7391f..fc2b08a 100644
--- a/OPENBSD_BRANCH
+++ b/OPENBSD_BRANCH
@@ -1 +1 @@
master OPENBSD_7_4
diff --git a/patches/win32_amd64_bn_arch.h.patch b/patches/win32_amd64_bn_arch.h.patch
index 20205dc..ad7c89d 100644
--- a/patches/win32_amd64_bn_arch.h.patch
+++ b/patches/win32_amd64_bn_arch.h.patch
@@ -1,17 +1,19 @@
1--- crypto/bn/arch/amd64/bn_arch.h.orig 2023-02-27 04:43:12.257874699 -0600 1--- crypto/bn/arch/amd64/bn_arch.h.orig 2023-02-27 04:43:12.257874699 -0600
2+++ crypto/bn/arch/amd64/bn_arch.h 2023-02-27 04:44:05.541873870 -0600 2+++ crypto/bn/arch/amd64/bn_arch.h 2023-02-27 04:44:05.541873870 -0600
3@@ -20,6 +20,10 @@ 3@@ -20,6 +20,12 @@
4 #ifndef HEADER_BN_ARCH_H 4 #ifndef HEADER_BN_ARCH_H
5 #define HEADER_BN_ARCH_H 5 #define HEADER_BN_ARCH_H
6 6
7+#ifdef _WIN32 7+#ifdef _WIN32
8+#ifndef OPENSSL_NO_ASM
8+#define OPENSSL_NO_ASM 9+#define OPENSSL_NO_ASM
10+#endif
9+#else 11+#else
10+ 12+
11 #ifndef OPENSSL_NO_ASM 13 #ifndef OPENSSL_NO_ASM
12 14
13 #define HAVE_BN_ADD 15 #define HAVE_BN_ADD
14@@ -85,6 +89,7 @@ 16@@ -85,6 +91,7 @@
15 *out_r0 = r0; 17 *out_r0 = r0;
16 } 18 }
17 #endif /* __GNUC__ */ 19 #endif /* __GNUC__ */
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index aa00455..d09b9da 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -769,11 +769,6 @@ add_executable(x509attribute x509attribute.c)
769target_link_libraries(x509attribute ${OPENSSL_TEST_LIBS}) 769target_link_libraries(x509attribute ${OPENSSL_TEST_LIBS})
770add_test(x509attribute x509attribute) 770add_test(x509attribute x509attribute)
771 771
772# x509_algor
773add_executable(x509_algor x509_algor.c)
774target_link_libraries(x509_algor ${OPENSSL_TEST_LIBS})
775add_test(x509_algor x509_algor)
776
777# x509_asn1 772# x509_asn1
778add_executable(x509_asn1 x509_asn1.c) 773add_executable(x509_asn1 x509_asn1.c)
779target_link_libraries(x509_asn1 ${OPENSSL_TEST_LIBS}) 774target_link_libraries(x509_asn1 ${OPENSSL_TEST_LIBS})
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5d87bde..b860ace 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -775,11 +775,6 @@ TESTS += x509attribute
775check_PROGRAMS += x509attribute 775check_PROGRAMS += x509attribute
776x509attribute_SOURCES = x509attribute.c 776x509attribute_SOURCES = x509attribute.c
777 777
778# x509_algor
779TESTS += x509_algor
780check_PROGRAMS += x509_algor
781x509_algor_SOURCES = x509_algor.c
782
783# x509_asn1 778# x509_asn1
784TESTS += x509_asn1 779TESTS += x509_asn1
785check_PROGRAMS += x509_asn1 780check_PROGRAMS += x509_asn1