diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-03-18 18:03:44 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-03-18 18:03:44 +0000 |
| commit | 4b47c4add3825fa29437a87a824e3702fd8d0505 (patch) | |
| tree | 062fc6c6bb9deef6351d6ee3284f48016f1ec106 | |
| parent | Batch mode; read exactly one line "login:unencrypted-password" from (diff) | |
| download | wireguard-openbsd-4b47c4add3825fa29437a87a824e3702fd8d0505.tar.xz wireguard-openbsd-4b47c4add3825fa29437a87a824e3702fd8d0505.zip | |
Drop the check for badly formed *etc sets when we check signatures; it saves
us time and if the sets are signed we can assume they are legit (yes, I am
an assumer).
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 94ce0836d39..13647a1ba17 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.123 2014/03/06 15:07:11 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.124 2014/03/18 18:03:44 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -131,8 +131,6 @@ get_set() { error_rm_wrkdir "${_url}: no such file" fi [[ ${_set} == etc ]] && TGZ=${_tgz} || XTGZ=${_tgz} - tar -tzf "${_tgz}" ./var/db/sysmerge/${_set}sum >/dev/null || \ - error_rm_wrkdir "${_tgz##*/}: badly formed \"${_set}\" set, lacks ./var/db/sysmerge/${_set}sum" if [ -z "${NOSIGCHECK}" ]; then if [ -z "${SIGFETCHED}" ]; then echo "===> Fetching ${_url%/*}/${SIGHASH}.sig" @@ -140,6 +138,9 @@ get_set() { error_rm_wrkdir "could not retrieve ${SIGHASH}.sig" fi check_sig "${_sigfile}" "${_tgz}" + else + tar -tzf "${_tgz}" ./var/db/sysmerge/${_set}sum >/dev/null || \ + error_rm_wrkdir "${_tgz##*/}: badly formed \"${_set}\" set, lacks ./var/db/sysmerge/${_set}sum" fi } |