From 6f9a60f5214f0fe61f2a7b32a08f38bb9609bc27 Mon Sep 17 00:00:00 2001 From: Ryan Saridar <8403417+VortixDev@users.noreply.github.com> Date: Wed, 7 Apr 2021 22:56:21 +0100 Subject: [PATCH 1/2] Fix swapped DESELECT and WTX annotations --- client/src/cmdhflist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/cmdhflist.c b/client/src/cmdhflist.c index d4dcb892f..278928d08 100644 --- a/client/src/cmdhflist.c +++ b/client/src/cmdhflist.c @@ -743,10 +743,10 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) { // S-block 11xxx010 if ((cmd[0] & 0xC0) && (cmdsize == 3)) { switch ((cmd[0] & 0x30)) { - case 0x30: + case 0x00: snprintf(exp, size, "S-block DESELECT"); break; - case 0x00: + case 0x30: snprintf(exp, size, "S-block WTX"); break; default: From af2ba79810dfbba770b760f6921f06f32477ed69 Mon Sep 17 00:00:00 2001 From: Ryan Saridar <8403417+VortixDev@users.noreply.github.com> Date: Wed, 7 Apr 2021 22:57:06 +0100 Subject: [PATCH 2/2] Update the changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 888617fbd..ae88615f8 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] + - Fix swapped DESELECT and WTX annotations (@VortixDev) - 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) - Changed `pm3 shell` - now prioritise USB connections in WSL1 (@gator96100)