Verify Tree-SHA512s in merge commits, enforce sigs are not SHA1

This commit is contained in:
Matt Corallo committed 2017-03-04 09:41:15 -05:00
1 parent be908a69bf
commit d9c450ffb2
3 files changed
+73 -3

No files matched your search

+6 -1
View File
@@ -8,7 +8,12 @@ VALID=false
REVSIG=false
IFS='
'
for LINE in $(echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null); do
if [ "$BITCOIN_VERIFY_COMMITS_ALLOW_SHA1" = 1 ]; then
GPG_RES="$(echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null)"
else
GPG_RES="$(echo "$INPUT" | gpg --trust-model always --weak-digest sha1 "$@" 2>/dev/null)"
fi
for LINE in $(echo "$GPG_RES"); do
case "$LINE" in
"[GNUPG:] VALIDSIG "*)
while read KEY; do