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" } } }