From 84c4b32b94fceb62a57609a34527a3016ec43079 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan Date: Thu, 7 Nov 2024 19:02:19 -0600 Subject: [PATCH 1/4] [macOS] Add openssl 1.1 back --- images/macos/scripts/build/install-openssl.sh | 22 ++++++++++--------- images/macos/scripts/tests/OpenSSL.Tests.ps1 | 13 +++-------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/images/macos/scripts/build/install-openssl.sh b/images/macos/scripts/build/install-openssl.sh index d883c7bd0..b5a10e093 100644 --- a/images/macos/scripts/build/install-openssl.sh +++ b/images/macos/scripts/build/install-openssl.sh @@ -6,20 +6,22 @@ source ~/utils/utils.sh -echo "Install openssl@3" -brew_smart_install "openssl@3" +echo "Install openssl@1.1" -if ! is_Arm64; then - # Symlink brew openssl@3 to `/usr/local/bin` as Homebrew refuses - ln -sf $(brew --prefix openssl@3)/bin/openssl /usr/local/bin/openssl -else - # arm64 has a different installation prefix for brew - ln -sf $(brew --prefix openssl@3)/bin/openssl /opt/homebrew/bin/openssl -fi +wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz +tar -xvf openssl-1.1.1w.tar.gz +cd openssl-1.1.1w +./config --prefix=/usr/local/openssl +make +sudo make install +export OPENSSL="/usr/local/openssl/bin" +echo "export OPENSSL=${OPENSSL}" >> ${HOME}/.bashrc + +ln -sf /usr/local/openssl/bin/openssl /usr/local/bin/openssl if ! is_Arm64; then # Most of build systems and scripts look up ssl here - ln -sf $(brew --cellar openssl@3)/3* /usr/local/opt/openssl + ln -sf $(brew --cellar openssl@1.1)/1.1* /usr/local/opt/openssl fi invoke_tests "OpenSSL" diff --git a/images/macos/scripts/tests/OpenSSL.Tests.ps1 b/images/macos/scripts/tests/OpenSSL.Tests.ps1 index 8f5e6956b..bbd23474f 100644 --- a/images/macos/scripts/tests/OpenSSL.Tests.ps1 +++ b/images/macos/scripts/tests/OpenSSL.Tests.ps1 @@ -7,17 +7,10 @@ Describe "OpenSSL" { } } - Context "OpenSSL 3 Path Check" { - It "OpenSSL 3 path exists" { - $openSSLpath = brew --prefix openssl@3 - $openSSLpath | Should -Exist - } - } - - Context "OpenSSL 3 is default" { - It "Default OpenSSL version is 3" { + Context "OpenSSL 1.1 is default" { + It "Default OpenSSL version is 1.1" { $commandResult = Get-CommandResult "openssl version" - $commandResult.Output | Should -Match "OpenSSL 3" + $commandResult.Output | Should -Match "OpenSSL 1.1" } } } From 5a82897b985ad12e9c9fdaec23efed550da6b82b Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan Date: Thu, 7 Nov 2024 19:05:15 -0600 Subject: [PATCH 2/4] [macOS] Add openssl 1.1 back --- images/macos/scripts/build/install-openssl.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/images/macos/scripts/build/install-openssl.sh b/images/macos/scripts/build/install-openssl.sh index b5a10e093..e2c0a221d 100644 --- a/images/macos/scripts/build/install-openssl.sh +++ b/images/macos/scripts/build/install-openssl.sh @@ -19,9 +19,4 @@ echo "export OPENSSL=${OPENSSL}" >> ${HOME}/.bashrc ln -sf /usr/local/openssl/bin/openssl /usr/local/bin/openssl -if ! is_Arm64; then - # Most of build systems and scripts look up ssl here - ln -sf $(brew --cellar openssl@1.1)/1.1* /usr/local/opt/openssl -fi - invoke_tests "OpenSSL" From 08198442380d4f43da31c30297980945d77772db Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan Date: Thu, 7 Nov 2024 23:12:29 -0600 Subject: [PATCH 3/4] [macOS] Add openssl 1.1 back --- images/macos/scripts/build/install-openssl.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/images/macos/scripts/build/install-openssl.sh b/images/macos/scripts/build/install-openssl.sh index e2c0a221d..3733ff3b0 100644 --- a/images/macos/scripts/build/install-openssl.sh +++ b/images/macos/scripts/build/install-openssl.sh @@ -17,6 +17,11 @@ sudo make install export OPENSSL="/usr/local/openssl/bin" echo "export OPENSSL=${OPENSSL}" >> ${HOME}/.bashrc -ln -sf /usr/local/openssl/bin/openssl /usr/local/bin/openssl +if ! is_Arm64; then + ln -sf ${OPENSSL}/openssl /usr/local/bin/openssl + ln -sf ${OPENSSL}/openssl /usr/local/opt/openssl +else + ln -sf ${OPENSSL}/openssl /opt/homebrew/bin/openssl +fi invoke_tests "OpenSSL" From 07f291cacf87d07fa5a54728f5988e3d9444754b Mon Sep 17 00:00:00 2001 From: susmitamane Date: Fri, 8 Nov 2024 17:51:52 +0530 Subject: [PATCH 4/4] [MacOS] Add openssl@1.1 back. --- images/macos/scripts/build/install-openssl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/scripts/build/install-openssl.sh b/images/macos/scripts/build/install-openssl.sh index 3733ff3b0..b463879de 100644 --- a/images/macos/scripts/build/install-openssl.sh +++ b/images/macos/scripts/build/install-openssl.sh @@ -8,8 +8,8 @@ source ~/utils/utils.sh echo "Install openssl@1.1" -wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz -tar -xvf openssl-1.1.1w.tar.gz +openssl_pkg=$(download_with_retry "https://www.openssl.org/source/openssl-1.1.1w.tar.gz") +tar -xvf $openssl_pkg cd openssl-1.1.1w ./config --prefix=/usr/local/openssl make