github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1638 from Doridian/fix/sha256sum-version

Browse source 
Sort filenames before hashing and force hashing in text mode
This commit is contained in:
Iceman 2022-03-27 08:33:14 +02:00 • committed by GitHub
commit 1c07e9d1bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -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)

2
tools/mkversion.sh
View file

@ -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"