diff options
| author | Matt Corallo <git@bluematt.me> | 2017-03-03 19:02:23 -0500 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2017-03-04 09:41:16 -0500 |
| commit | d025bc79644f230d26e3cb02d11c0b360d129946 (patch) | |
| tree | 6498e7ce248806cce6676f18db4edd3d3d2d62b9 /contrib/verify-commits | |
| parent | eddc77a1b1a59df4c7ba1a0705d684529b2205a1 (diff) | |
Allow any subkey in verify-commits
Diffstat (limited to 'contrib/verify-commits')
| -rwxr-xr-x | contrib/verify-commits/gpg.sh | 2 | ||||
| -rw-r--r-- | contrib/verify-commits/trusted-keys | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/verify-commits/gpg.sh b/contrib/verify-commits/gpg.sh index 61e7552863..38ce817b94 100755 --- a/contrib/verify-commits/gpg.sh +++ b/contrib/verify-commits/gpg.sh @@ -26,7 +26,7 @@ for LINE in $(echo "$GPG_RES"); do case "$LINE" in "[GNUPG:] VALIDSIG "*) while read KEY; do - case "$LINE" in "[GNUPG:] VALIDSIG $KEY "*) VALID=true;; esac + [ "${LINE#?GNUPG:? VALIDSIG * * * * * * * * * }" = "$KEY" ] && VALID=true done < ./contrib/verify-commits/trusted-keys ;; "[GNUPG:] REVKEYSIG "*) diff --git a/contrib/verify-commits/trusted-keys b/contrib/verify-commits/trusted-keys index 75242c2a97..5610692616 100644 --- a/contrib/verify-commits/trusted-keys +++ b/contrib/verify-commits/trusted-keys @@ -1,4 +1,4 @@ 71A3B16735405025D447E8F274810B012346C9A6 -3F1888C6DCA92A6499C4911FDBA1A67379A1A931 +133EAC179436F14A5CF1B794860FEB804E669320 32EE5C4C3FA15CCADB46ABE529D4BCB6416F53EC -FE09B823E6D83A3BC7983EAA2D7F2372E50FE137 +B8B3F1C0E58C15DB6A81D30C3648A882F4316B9B |