diff options
| author | Klemens Nanni <kn@cvs.openbsd.org> | 2021-10-24 10:11:25 +0000 |
|---|---|---|
| committer | Klemens Nanni <kn@cvs.openbsd.org> | 2021-10-24 10:11:25 +0000 |
| commit | 7da78a40e29a1663f2b0c5c93e303f594f285aa2 (patch) | |
| tree | 1af54e8ae57a0bf3b405a0212b3372b452460fbc | |
| parent | de177e4bd5f29ef277cce5784fef710933742753 (diff) | |
Fall back to HTTP for fetching automatically
Drop the "Unable to connect using https. Use http instead?" question as it
does not provide any security benefit; SHA256.sig is used to verify sets.
Do provide an informative message iff the fallback happened such that
installations/upgrades that cannot Get/Verify first but Install directly
can be aborted in lack of SHA256.sig, i.e. sets were fetched over HTTP and
verification would be skipped.
Discussed with deraadt tb
OK deraadt
| -rw-r--r-- | distrib/miniroot/install.sub | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index be4cb51e38c..f746d6ce772 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1181 2021/10/23 14:49:06 kn Exp $ +# $OpenBSD: install.sub,v 1.1182 2021/10/24 10:11:24 kn Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -1867,8 +1867,7 @@ install_http() { case $_tls in force) $AI && exit 1 || return ;; - try) ask_yn "Unable to connect using https. Use http instead?" || - return + try) echo "Unable to connect using HTTPS; using HTTP instead." _http_proto=http _url_base="http://$HTTP_SERVER/$HTTP_DIR" unpriv -f $_sig ftp -vMo $_sig "$_url_base/SHA256.sig" \ |