Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[macOS] Replace openssl 1.1 with openssl 3 #10851

Merged
merged 2 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions images/macos/scripts/build/install-openssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
12 changes: 6 additions & 6 deletions images/macos/scripts/tests/OpenSSL.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ Describe "OpenSSL" {
}
}

Context "OpenSSL 1.1 Path Check" {
It "OpenSSL 1.1 path exists" {
$openSSLpath = brew --prefix openssl@1.1

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Context "OpenSSL 3 Path Check" {
It "OpenSSL 3 path exists" {
$openSSLpath = brew --prefix openssl@3

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$openSSLpath | Should -Exist

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

}
}

Context "OpenSSL 1.1 is default" {
It "Default OpenSSL version is 1.1" {
Context "OpenSSL 3 is default" {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It "Default OpenSSL version is 3" {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

# #11646

$commandResult = Get-CommandResult "openssl version"
$commandResult.Output | Should -Match "OpenSSL 1.1"
$commandResult.Output | Should -Match "OpenSSL 3"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A first-level heading

A second-level heading

A third-level heading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Text that is not a quote

Text that is a quote

}
}
}