Merge pull request #10931 from github-maccloud/macos-openssl1.1-issue

Macos openssl1.1 issue

images/macos/scripts/build/install-openssl.sh

@@ -6,20 +6,22 @@
 
 source ~/utils/utils.sh
 
-echo "Install openssl@3"
+echo "Install openssl@1.1"
-brew_smart_install "openssl@3"
+
+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
+sudo make install
+export OPENSSL="/usr/local/openssl/bin"
+echo "export OPENSSL=${OPENSSL}" >> ${HOME}/.bashrc
 
 if ! is_Arm64; then
-  # Symlink brew openssl@3 to `/usr/local/bin` as Homebrew refuses
+  ln -sf ${OPENSSL}/openssl /usr/local/bin/openssl
-  ln -sf $(brew --prefix openssl@3)/bin/openssl /usr/local/bin/openssl
+  ln -sf ${OPENSSL}/openssl /usr/local/opt/openssl
 else
-  # arm64 has a different installation prefix for brew
+  ln -sf ${OPENSSL}/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@3)/3* /usr/local/opt/openssl
 fi
 
 invoke_tests "OpenSSL"

images/macos/scripts/tests/OpenSSL.Tests.ps1

@@ -7,17 +7,10 @@ Describe "OpenSSL" {
         }
     }
 
-    Context "OpenSSL 3 Path Check" {
+    Context "OpenSSL 1.1 is default" {
-        It "OpenSSL 3 path exists" {
+        It "Default OpenSSL version is 1.1" {
-            $openSSLpath = brew --prefix openssl@3
-            $openSSLpath | Should -Exist
-        }
-    }
-
-    Context "OpenSSL 3 is default" {
-        It "Default OpenSSL version is 3" {
             $commandResult = Get-CommandResult "openssl version"
-            $commandResult.Output | Should -Match "OpenSSL 3"
+            $commandResult.Output | Should -Match "OpenSSL 1.1"
         }
     }
 }