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 #1249 from VortixDev/VortixDev-patch-desfire-annotation

Browse source 
Fix DESFire mis-annotation
This commit is contained in:
Iceman 2021-04-17 21:46:28 +02:00 • committed by GitHub
commit b68f2dcc3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 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... 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] ## [unreleased][unreleased]
- Fix DESFire mis-annotation (@VortixDev)
- Change `lf pac demod` - now also search for inverted bitstreams (@iceman1001) - Change `lf pac demod` - now also search for inverted bitstreams (@iceman1001)
- Change `hf 14b reader` - now supports continous mode (@iceman1001) - Change `hf 14b reader` - now supports continous mode (@iceman1001)
- Fix `hf search` - now doesn't false identify ISO15693 (@iceman1001) - Fix `hf search` - now doesn't false identify ISO15693 (@iceman1001)

7
client/src/cmdhflist.c
View file

@ -776,6 +776,8 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
pos++; pos++;
for (uint8_t i = 0; i < 2; i++, pos++) { for (uint8_t i = 0; i < 2; i++, pos++) {
bool found_annotation = true;
switch (cmd[pos]) { switch (cmd[pos]) {
case MFDES_CREATE_APPLICATION: case MFDES_CREATE_APPLICATION:
snprintf(exp, size, "CREATE APPLICATION"); snprintf(exp, size, "CREATE APPLICATION");
@ -892,8 +894,13 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
snprintf(exp, size, "READ SIGNATURE"); snprintf(exp, size, "READ SIGNATURE");
break; break;
default: default:
found_annotation = false;
break; break;
} }
if (found_annotation) {
break;
}
} }
} else { } else {
// anything else // anything else