From 65363bc002974bdf88b7312be033707d6e24e55a Mon Sep 17 00:00:00 2001 From: Sean Parkinson Date: Mon, 29 Apr 2024 11:31:31 +1000 Subject: [PATCH 1/2] Fix CI so that wolfSSL builds with appropriate ASM for macOS chip --- .github/workflows/autotools.yml | 7 ++++++- .github/workflows/cmake.yml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml index 45281f14c..42cb1235a 100644 --- a/.github/workflows/autotools.yml +++ b/.github/workflows/autotools.yml @@ -59,7 +59,12 @@ jobs: git clone https://github.com/wolfSSL/wolfssl cd wolfssl ./autogen.sh - ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream' + CPU=`sysctl -n machdep.cpu.brand_string` + if [[ "$CPU" =~ Intel ]]; then + ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream' + else + ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-armasm' '--enable-aesgcm-stream' + fi make sudo make install cd .. diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index cc5739b27..668ff34a2 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -86,7 +86,12 @@ jobs: git clone https://github.com/wolfSSL/wolfssl cd wolfssl ./autogen.sh - ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream' + CPU=`sysctl -n machdep.cpu.brand_string` + if [[ "$CPU" =~ Intel ]]; then + ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream' + else + ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-armasm' '--enable-aesgcm-stream' + fi make sudo make install cd .. From c2dbe476d7e60aa985ab414ef597bfaa135190d8 Mon Sep 17 00:00:00 2001 From: Sean Parkinson Date: Mon, 29 Apr 2024 11:37:30 +1000 Subject: [PATCH 2/2] Checkout wolfSSL at 5.7.0 stable tag --- .github/workflows/autotools.yml | 2 ++ .github/workflows/cmake.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml index 42cb1235a..8d5bd2f98 100644 --- a/.github/workflows/autotools.yml +++ b/.github/workflows/autotools.yml @@ -37,6 +37,7 @@ jobs: run: | git clone https://github.com/wolfSSL/wolfssl cd wolfssl + git checkout v5.7.0-stable ./autogen.sh ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream' make @@ -58,6 +59,7 @@ jobs: brew install autoconf automake libtool git clone https://github.com/wolfSSL/wolfssl cd wolfssl + git checkout v5.7.0-stable ./autogen.sh CPU=`sysctl -n machdep.cpu.brand_string` if [[ "$CPU" =~ Intel ]]; then diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 668ff34a2..d85557df9 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -53,6 +53,7 @@ jobs: run: | git clone https://github.com/wolfSSL/wolfssl cd wolfssl + git checkout v5.7.0-stable ./autogen.sh ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream' make @@ -85,6 +86,7 @@ jobs: brew install autoconf automake libtool git clone https://github.com/wolfSSL/wolfssl cd wolfssl + git checkout v5.7.0-stable ./autogen.sh CPU=`sysctl -n machdep.cpu.brand_string` if [[ "$CPU" =~ Intel ]]; then