6 files changed, 36 insertions, 34 deletions

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
new file mode 100644
index 0000000..e813191
--- /dev/null
+++ b/.github/workflows/macos.yml
@@ -0,0 +1,31 @@
+# GitHub Actions workflow to run tests on macOS.
+name: "macOS"
+
+on:
+  push: {}
+  pull_request: {}
+  schedule:
+    - cron: "0 0 * * 0" # At 00:00 weekly on Sunday.
+
+jobs:
+  test:
+    name: "${{ matrix.os }}/${{ matrix.arch }}"
+    runs-on: "${{ matrix.os }}"
+    permissions:
+      contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["macos-13", "macos-12"]
+        arch: ["arm64", "x86_64"]
+    steps:
+    - name: "Install required packages"
+      run: brew install automake
+
+    - name: "Checkout repository"
+      uses: actions/checkout@v4
+
+    - name: "Run tests"
+      run: ./scripts/test
+      env:
+        ARCH: "${{ matrix.arch }}"
diff --git a/.github/workflows/macos_test.yml b/.github/workflows/macos_test.yml
deleted file mode 100644
index 9f88d77..0000000
--- a/.github/workflows/macos_test.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: macos_ci
-
-on: [push, pull_request]
-
-jobs:
-  build-native:
-    strategy:
-      matrix:
-        os: [macos-13, macos-12]
-        arch: [arm64, x86_64]
-    runs-on: ${{ matrix.os }}
-    continue-on-error: false
-    env:
-      ARCH: ${{ matrix.arch }}
-    name: ${{ matrix.os }} - ${{ matrix.arch }}
-    steps:
-    - name: Install packages for macos
-      run: brew install automake
-    - uses: actions/checkout@main
-    - name: Run CI script
-      run: ./scripts/test
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 @@
 --- 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__ */
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)
 target_link_libraries(x509attribute ${OPENSSL_TEST_LIBS})
 add_test(x509attribute x509attribute)
 
-# x509_algor
-add_executable(x509_algor x509_algor.c)
-target_link_libraries(x509_algor ${OPENSSL_TEST_LIBS})
-add_test(x509_algor x509_algor)
-
 # x509_asn1
 add_executable(x509_asn1 x509_asn1.c)
 target_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
 check_PROGRAMS += x509attribute
 x509attribute_SOURCES = x509attribute.c
 
-# x509_algor
-TESTS += x509_algor
-check_PROGRAMS += x509_algor
-x509_algor_SOURCES = x509_algor.c
-
 # x509_asn1
 TESTS += x509_asn1
 check_PROGRAMS += x509_asn1