From cdd17a06b79c86ffe3b8b7c1aea912221c5636e6 Mon Sep 17 00:00:00 2001 From: Doridian Date: Sat, 26 Mar 2022 23:03:07 -0700 Subject: [PATCH] Sort filenames before hashing and force hashing in text mode to avoid inconsistencies --- CHANGELOG.md | 1 + tools/mkversion.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89083e8b3..cea15af82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... ## [unreleased][unreleased] + - Changed calculation of companion ARM firmware hash to be uniform accross platforms (@Doridian) - Changed `hf mf *` - verbose flag now also decode and prints found value blocks (@iceman1001) - Changed `hf mf wrbl` - added more helptext and new param --force to point out block0 writes (@iceman1001) - Changed `hf 15 raw` - it now uses NG frame for response (@iceman1001) diff --git a/tools/mkversion.sh b/tools/mkversion.sh index 9a147c061..c1819f34e 100755 --- a/tools/mkversion.sh +++ b/tools/mkversion.sh @@ -63,7 +63,7 @@ sha=$( cd "$pm3path" || return # did we find the src? [ -f armsrc/appmain.c ] || return - ls armsrc/*.[ch] common_arm/*.[ch]|grep -E -v "(disabled|version_pm3|fpga_version_info)"|xargs sha256sum|sha256sum|cut -c -9 + ls armsrc/*.[ch] common_arm/*.[ch]|grep -E -v "(disabled|version_pm3|fpga_version_info)"|sort|xargs sha256sum -t|sha256sum|cut -c -9 ) if [ "$sha" = "" ]; then sha="no sha256"