From e8afdcee807654139a2d0bb392e9efb188881e76 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan Date: Wed, 16 Oct 2024 11:51:50 -0500 Subject: [PATCH] [macOS] Update openssl from 1.1 to 3 --- images/macos/scripts/build/install-openssl.sh | 12 ++++++------ images/macos/scripts/tests/OpenSSL.Tests.ps1 | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/images/macos/scripts/build/install-openssl.sh b/images/macos/scripts/build/install-openssl.sh index 16f11fe761..d883c7bd09 100644 --- a/images/macos/scripts/build/install-openssl.sh +++ b/images/macos/scripts/build/install-openssl.sh @@ -6,20 +6,20 @@ source ~/utils/utils.sh -echo "Install openssl@1.1" -brew_smart_install "openssl@1.1" +echo "Install openssl@3" +brew_smart_install "openssl@3" if ! is_Arm64; then - # Symlink brew openssl@1.1 to `/usr/local/bin` as Homebrew refuses - ln -sf $(brew --prefix openssl@1.1)/bin/openssl /usr/local/bin/openssl + # 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@1.1)/bin/openssl /opt/homebrew/bin/openssl + ln -sf $(brew --prefix openssl@3)/bin/openssl /opt/homebrew/bin/openssl fi 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 + ln -sf $(brew --cellar openssl@3)/3* /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 1fb8886a8a..8f5e6956b6 100644 --- a/images/macos/scripts/tests/OpenSSL.Tests.ps1 +++ b/images/macos/scripts/tests/OpenSSL.Tests.ps1 @@ -7,17 +7,17 @@ Describe "OpenSSL" { } } - Context "OpenSSL 1.1 Path Check" { - It "OpenSSL 1.1 path exists" { - $openSSLpath = brew --prefix openssl@1.1 + Context "OpenSSL 3 Path Check" { + It "OpenSSL 3 path exists" { + $openSSLpath = brew --prefix openssl@3 $openSSLpath | Should -Exist } } - Context "OpenSSL 1.1 is default" { - It "Default OpenSSL version is 1.1" { + Context "OpenSSL 3 is default" { + It "Default OpenSSL version is 3" { $commandResult = Get-CommandResult "openssl version" - $commandResult.Output | Should -Match "OpenSSL 1.1" + $commandResult.Output | Should -Match "OpenSSL 3" } } }