Skip to content

Commit

Permalink
fix: enable tlsv1.2 if curl supports it (#3464)
Browse files Browse the repository at this point in the history
curl 7.73 (see curl/curl@aa8777f) changed the output of `curl --help` to display categories, rather than all of the options, unless you pass `--help all`.  This caused the install script to run in a less secure mode.

The install script also calls "wget --help".  "wget --help all" works at least as far back as 1.5.3 (~2015).

Also checked "curl --help all" with curl 7.54.0.  It shows the same output as "curl --help" and returns exit code 0.
  • Loading branch information
ericswanson-dfinity authored Dec 4, 2023
1 parent 20583ed commit b179e51
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@

Previously, `dfx ledger top-up` only accepted canister principals. Now it accepts both principals and canister names.

### fix: installer once again detects if curl supports tlsv1.2

A change to `curl --help` output made it so the install script did not detect
that the `--proto` and `--tlsv1.2` options are available.

# 0.15.2

### fix: `dfx canister delete <canister id>` removes the related entry from the canister id store
Expand Down
2 changes: 1 addition & 1 deletion public/install/200_downloader.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ check_help_for() {
fi

for _arg in "$@"; do
if ! "$_cmd" --help | grep -q -- "$_arg"; then
if ! "$_cmd" --help all | grep -q -- "$_arg"; then
_ok="n"
fi
done
Expand Down

0 comments on commit b179e51

Please sign in to comment.