From 43a987c1cbcd04b9c59052606c3c31c56abc826e Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sun, 5 Mar 2017 11:19:17 -0500 Subject: Fix regsig checking for subkey sigs in verify-commits Rebased-From: bbd757940bcb0628df6f7a5bd1fb348cf2290502 --- contrib/verify-commits/gpg.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/contrib/verify-commits/gpg.sh b/contrib/verify-commits/gpg.sh index 2944bb269d..4b2649eaaa 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 -- cgit v1.2.3