aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Corallo <[email protected]>2017-03-05 11:19:17 -0500
committerWladimir J. van der Laan <[email protected]>2017-03-05 19:09:49 +0100
commit43a987c1cbcd04b9c59052606c3c31c56abc826e (patch)
treed3c690f7e75f3dc9670ad4481124cc2ffe246314
parentMerge #9920: [0.14] Allow any subkey in verify-commits (BlueMatt) (diff)
downloaddiscoin-43a987c1cbcd04b9c59052606c3c31c56abc826e.tar.xz
discoin-43a987c1cbcd04b9c59052606c3c31c56abc826e.zip
Fix regsig checking for subkey sigs in verify-commits
Rebased-From: bbd757940bcb0628df6f7a5bd1fb348cf2290502
-rwxr-xr-xcontrib/verify-commits/gpg.sh8
1 files changed, 2 insertions, 6 deletions
diff --git a/contrib/verify-commits/gpg.sh b/contrib/verify-commits/gpg.sh
index 2944bb269..4b2649eaa 100755
--- a/contrib/verify-commits/gpg.sh
+++ b/contrib/verify-commits/gpg.sh
@@ -17,12 +17,8 @@ for LINE in $(echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null); do
;;
"[GNUPG:] REVKEYSIG "*)
[ "$BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG" != 1 ] && exit 1
- while read KEY; do
- case "$LINE" in "[GNUPG:] REVKEYSIG ${KEY#????????????????????????} "*)
- REVSIG=true
- GOODREVSIG="[GNUPG:] GOODSIG ${KEY#????????????????????????} "
- esac
- done < ./contrib/verify-commits/trusted-keys
+ REVSIG=true
+ GOODREVSIG="[GNUPG:] GOODSIG ${LINE#* * *}"
;;
esac
done