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

Merge pull request #1236 from VortixDev/VortixDev-patch-sblock-annotations

Browse source 
Fix swapped DESELECT and WTX annotations
This commit is contained in:
Iceman 2021-04-08 07:00:08 +02:00 • committed by GitHub
commit b654769963
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 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 swapped DESELECT and WTX annotations (@VortixDev)
- Fixed `hf 15 findafi` - cliparser bug, and loop is user interruptable (@iceman1001) - Fixed `hf 15 findafi` - cliparser bug, and loop is user interruptable (@iceman1001)
- Added `hf mf wipe` - takes a keyfile and wipes a MFC to default values (@iceman1001) - Added `hf mf wipe` - takes a keyfile and wipes a MFC to default values (@iceman1001)
- Changed `pm3 shell` - now prioritise USB connections in WSL1 (@gator96100) - Changed `pm3 shell` - now prioritise USB connections in WSL1 (@gator96100)

4
client/src/cmdhflist.c
View file

@ -743,10 +743,10 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
// S-block 11xxx010 // S-block 11xxx010
if ((cmd[0] & 0xC0) && (cmdsize == 3)) { if ((cmd[0] & 0xC0) && (cmdsize == 3)) {
switch ((cmd[0] & 0x30)) { switch ((cmd[0] & 0x30)) {
case 0x30: case 0x00:
snprintf(exp, size, "S-block DESELECT"); snprintf(exp, size, "S-block DESELECT");
break; break;
case 0x00: case 0x30:
snprintf(exp, size, "S-block WTX"); snprintf(exp, size, "S-block WTX");
break; break;
default: default: