summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@hadrons.org>2024-09-30 02:00:58 +0200
committerTimo Weingärtner <timo@tiwe.de>2024-10-24 10:55:14 +0200
commitc26168119320ca5b03e6b420e3c4192d1e2ecc6a (patch)
tree49f1c0203db2f0ce7406de0868f0f5eff389202b
parenta18b87e43ece9a448ab912225e1a26d8fd4b3e7f (diff)
downloadopenssh-known-hosts-c26168119320ca5b03e6b420e3c4192d1e2ecc6a.tar.gz
Current gpgv requires the datafile for detached signatures
Otherwise we get the following error: gpgv: no signed data gpgv: can't hash datafile: No data
-rwxr-xr-xplugins/curl2
-rwxr-xr-xplugins/rsync2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/curl b/plugins/curl
index 989891a..b9dd2cb 100755
--- a/plugins/curl
+++ b/plugins/curl
@@ -14,7 +14,7 @@ set -e
if [ "${SIGURL}" ]; then
curl -fRz "./current" -m 300 ${CURL_OPTIONS} -o new.sig "${SIGURL}" -o new "${URL}"
[ -e new ] || exit 0
- gpgv --keyring "${KEYRING}" --status-fd 2 new.sig || exit 1
+ gpgv --keyring "${KEYRING}" --status-fd 2 new.sig new || exit 1
# return 1 because it's not clear what other codes may used
else
curl -fRz "./current" -m 300 ${CURL_OPTIONS} -o new "${URL}"
diff --git a/plugins/rsync b/plugins/rsync
index 2ff5c1a..1c2cae2 100755
--- a/plugins/rsync
+++ b/plugins/rsync
@@ -15,7 +15,7 @@ rsync -vt --timeout=300 "${URL}" new
if [ "${SIGURL}" ]; then
rsync -vt --timeout=300 "${SIGURL}" new.sig
- gpgv --keyring "${KEYRING}" --status-fd 2 new.sig || exit 1
+ gpgv --keyring "${KEYRING}" --status-fd 2 new.sig new || exit 1
# return 1 because it's not clear what other codes may used
fi