kvazar/kevacoin
1
0
Fork 0
mirror of https://github.com/kvazar-network/kevacoin.git synced 2025-01-23 13:24:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix bashisms in verify-commits and always check top commit's tree

Browse Source
This commit is contained in:
Matt Corallo 2017-03-06 16:14:13 -05:00
parent f20e664f40
commit b3ec305f8e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/verify-commits/trusted-sha512-root-commit
View File

@ -1 +1 @@
b00ba6251f71fa1edaabdf809514e1bc3c67862e f7ec7cfd38b543ba81ac7bed5b77f9a19739460b

13
contrib/verify-commits/verify-commits.sh
View File

@ -47,7 +47,8 @@ IS_SIGNED () {
return 1; return 1;
fi fi
if [ "$VERIFY_TREE" = 1 ]; then # We set $4 to 1 on the first call, always verifying the top of the tree
if [ "$VERIFY_TREE" = 1 -o "$4" = "1" ]; then
IFS_CACHE="$IFS" IFS_CACHE="$IFS"
IFS=' IFS='
' '
@ -63,9 +64,10 @@ IS_SIGNED () {
IFS="$IFS_CACHE" IFS="$IFS_CACHE"
FILE_HASHES="" FILE_HASHES=""
for FILE in $(git ls-tree --full-tree -r --name-only $1 | LANG=C sort); do for FILE in $(git ls-tree --full-tree -r --name-only $1 | LC_ALL=C sort); do
HASH=$(git cat-file blob $1:"$FILE" | sha512sum | { read FIRST OTHER; echo $FIRST; } ) HASH=$(git cat-file blob $1:"$FILE" | sha512sum | { read FIRST OTHER; echo $FIRST; } )
[ "$FILE_HASHES" != "" ] && FILE_HASHES="$FILE_HASHES"$'\n' [ "$FILE_HASHES" != "" ] && FILE_HASHES="$FILE_HASHES"'
'
FILE_HASHES="$FILE_HASHES$HASH $FILE" FILE_HASHES="$FILE_HASHES$HASH $FILE"
done done
HASH_MATCHES=0 HASH_MATCHES=0
@ -86,7 +88,7 @@ IS_SIGNED () {
local PARENTS local PARENTS
PARENTS=$(git show -s --format=format:%P $1) PARENTS=$(git show -s --format=format:%P $1)
for PARENT in $PARENTS; do for PARENT in $PARENTS; do
if IS_SIGNED $PARENT $VERIFY_TREE $NO_SHA1; then if IS_SIGNED $PARENT $VERIFY_TREE $NO_SHA1 0; then
return 0; return 0;
fi fi
break break
@ -111,10 +113,9 @@ fi
DO_CHECKOUT_TEST=0 DO_CHECKOUT_TEST=0
if [ x"$2" = "x--tree-checks" ]; then if [ x"$2" = "x--tree-checks" ]; then
DO_CHECKOUT_TEST=1 DO_CHECKOUT_TEST=1
fi fi
IS_SIGNED "$TEST_COMMIT" "$DO_CHECKOUT_TEST" 1 IS_SIGNED "$TEST_COMMIT" "$DO_CHECKOUT_TEST" 1 1
RES=$? RES=$?
if [ "$RES" = 1 ]; then if [ "$RES" = 1 ]; then
if ! "$HAVE_FAILED"; then if ! "$HAVE_FAILED"; then