macOS 14 instead of 12

matteocorti · Dec 5, 2024 · 7559606 · 7559606
1 parent c3e6e30
commit 7559606
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -35,8 +35,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-12
           - macos-13
+          - macos-14
           - macos-latest
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/.github/workflows/integration_tests_with_proxy.yml b/.github/workflows/integration_tests_with_proxy.yml
@@ -35,8 +35,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-12
           - macos-13
+          - macos-14
           - macos-latest
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -29,8 +29,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-12
           - macos-13
+          - macos-14
           - macos-latest
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/.github/workflows/unit_tests_with_proxy.yml b/.github/workflows/unit_tests_with_proxy.yml
@@ -29,8 +29,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-12
           - macos-13
+          - macos-14
           - macos-latest
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/check_ssl_cert b/check_ssl_cert
@@ -1511,6 +1511,18 @@ require_s_client_option() {
     fi
 }
 
+################################################################################
+# Checks if s_client does not support the given option
+#
+# Usage:
+#   check_s_client_option '-no_ssl2'
+#
+check_s_client_option() {
+    debuglog "Checking if s_client supports the $1 option"
+    "${OPENSSL}" s_client -help 2>&1 | "${GREP_BIN}" -q -- "$1"
+    return $?
+}
+
 ################################################################################
 # Exits with unknown if x509 does not support the given option
 #
@@ -5898,7 +5910,11 @@ main() {
 
     CLIENT=""
     if [ -n "${CLIENT_CERT}" ]; then
-        CLIENT="-cert ${CLIENT_CERT}"
+        if check_s_client_option '-chainCAfile'; then
+            CLIENT="-cert ${CLIENT_CERT} -chainCAfile ${CLIENT_CERT}"
+        else
+            CLIENT="-cert ${CLIENT_CERT}"
+        fi
     fi
     if [ -n "${CLIENT_KEY}" ]; then
         CLIENT="${CLIENT} -key ${CLIENT_KEY}"