Fix regsig checking for subkey sigs in verify-commits

Rebased-From: bbd7579
bitcoin · 43a987c1cbcd04b9c59052606c3c31c56abc826e · TheBlueMatt committed with laanwj Mar 5, 2017

This commit was signed with a verified signature.

laanwj Wladimir J. van der Laan

GPG key ID: 74810B012346C9A6 Learn about signing commits · Mar 5, 2017 · 43a987c
1 parent ccf5e43
commit 43a987c1cbcd04b9c59052606c3c31c56abc826e
Unified Split

Showing with 2 additions and 6 deletions.

+2 −6 contrib/verify-commits/gpg.sh
diff --git 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