Remove vendored openssl

This isn't actually necessary!
mistydemeo · May 27, 2017 · c21456a · c21456a
1 parent b9ae2c9
commit c21456a
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 63 deletions.
diff --git a/Library/Homebrew/cmd/vendor-install.sh b/Library/Homebrew/cmd/vendor-install.sh
@@ -22,14 +22,11 @@ then
     ruby_SHA="5c1240abe4be91c9774a0089c2a38a8ccfff87c009e8e5786730c659d5e633f7"
   fi
 
-  # Universal OpenSSL and Curl used on older OS Xs to download software and calculate sha256s
+  # Universal Curl used on older OS Xs to download software
   if [[ "$HOMEBREW_OSX_VERSION_NUMERIC" -lt "100900" ]]
   then
     curl_URL="https://archive.org/download/tigerbrew/portable-curl-7.53.1.tiger.bottle.tar.gz"
     curl_SHA="e4c142abd7720d0796415d232fd1577e5ab9005c65ad79d8b731ea30a27a051e"
-
-    openssl_URL="https://archive.org/download/tigerbrew/portable-openssl-1.0.2k.tiger.bottle.tar.gz"
-    openssl_SHA="fa04456498f6f6192d985e281b1a8a88effca01d0b8d6521f8f1f6de03ad6c4d"
   fi
 elif [[ -n "$HOMEBREW_LINUX" ]]
 then

diff --git a/Library/Homebrew/utils/openssl.sh b/Library/Homebrew/utils/openssl.sh
diff --git a/Library/Homebrew/vendor/portable-openssl-version b/Library/Homebrew/vendor/portable-openssl-version
diff --git a/Library/Homebrew/vendor/sha256 b/Library/Homebrew/vendor/sha256
@@ -8,12 +8,10 @@
 # These two variables should be defined if this was called through brew;
 # otherwise, define them by shelling out in case this was called manually.
 homebrew_prefix=${HOMEBREW_PREFIX:-$(brew --repository)}
-homebrew_repository=${HOMEBREW_REPOSITORY:-$(brew --repository)}
 
 homebrew_openssl="$homebrew_prefix/opt/openssl/bin/openssl"
-vendor_openssl="$homebrew_repository/Library/Homebrew/vendor/portable-openssl/current/bin/openssl"
 
-for util in "sha2 -q -256" "openssl dgst -sha256" "$vendor_openssl" "$homebrew_openssl dgst -sha256" "shasum -a 256" "gsha256sum"
+for util in "sha2 -q -256" "openssl dgst -sha256" "$homebrew_openssl dgst -sha256" "shasum -a 256" "gsha256sum"
 do
   $util </dev/null 2>/dev/null | grep e3b0c >/dev/null 2>&1 &&
     exec $util "$@" | sed -e's|.*= ||' -e's| .*||' && exit 0

diff --git a/Library/brew.sh b/Library/brew.sh
@@ -188,8 +188,6 @@ fi
 
 # Hide shellcheck complaint:
 # shellcheck source=/dev/null
-source "$HOMEBREW_LIBRARY/Homebrew/utils/openssl.sh"
-setup-openssl-path
 source "$HOMEBREW_LIBRARY/Homebrew/utils/ruby.sh"
 setup-ruby-path
 source "$HOMEBREW_LIBRARY/Homebrew/utils/curl.sh"