From b7e1d6944ac4bfce6b9abb8fbef98891231e1514 Mon Sep 17 00:00:00 2001 From: ry4000 <154689120+ry4000@users.noreply.github.com> Date: Mon, 3 Nov 2025 14:21:18 +1100 Subject: [PATCH 1/7] R&Y: Update `hf mfdes bruteaid` Progress in `cmdhfmfdes.c` Testing Discord/@jump41's suggestion for implementation. Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com> --- client/src/cmdhfmfdes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c index 35e428821..a3525d024 100644 --- a/client/src/cmdhfmfdes.c +++ b/client/src/cmdhfmfdes.c @@ -2232,7 +2232,7 @@ static int CmdHF14ADesBruteApps(const char *Cmd) { break; } - float progress = ((id - idStart) / (idEnd - idStart)); + float progress = 100.0 * (float)(id - idStart) / ((float)(idEnd - idStart)); PrintAndLogEx(INPLACE, "Progress " _YELLOW_("%0.1f") " %% current AID: %06X", progress, id); res = DesfireSelectAIDHexNoFieldOn(&dctx, id); From 4bc64fe626641c54f5f7bf157279abc15f89f8df Mon Sep 17 00:00:00 2001 From: ry4000 <154689120+ry4000@users.noreply.github.com> Date: Mon, 3 Nov 2025 14:49:00 +1100 Subject: [PATCH 2/7] R&Y: Update Progress Interval in `cmdhfmfdes.c` Testing to see if it is possible to increase the progress bar to two decimal points. Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com> --- client/src/cmdhfmfdes.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c index a3525d024..90062a0db 100644 --- a/client/src/cmdhfmfdes.c +++ b/client/src/cmdhfmfdes.c @@ -2232,14 +2232,14 @@ static int CmdHF14ADesBruteApps(const char *Cmd) { break; } - float progress = 100.0 * (float)(id - idStart) / ((float)(idEnd - idStart)); - PrintAndLogEx(INPLACE, "Progress " _YELLOW_("%0.1f") " %% current AID: %06X", progress, id); + float progress = 100.00 * (float)(id - idStart) / ((float)(idEnd - idStart)); + PrintAndLogEx(INPLACE, "Progress " _YELLOW_("%0.01f") " %% current AID: %06X", progress, id); res = DesfireSelectAIDHexNoFieldOn(&dctx, id); if (res == PM3_SUCCESS) { printf("\33[2K\r"); // clear current line before printing - PrintAndLogEx(SUCCESS, "Got new APPID " _GREEN_("%06X"), id); + PrintAndLogEx(SUCCESS, "Found New DESFire Application ID " _GREEN_("%06X"), id); } } From 3a77d041e5fd8025d32bd47ad93662507ff0b6dd Mon Sep 17 00:00:00 2001 From: ry4000 <154689120+ry4000@users.noreply.github.com> Date: Mon, 3 Nov 2025 15:00:47 +1100 Subject: [PATCH 3/7] R&Y: Test Progress Integer Update in `cmdhfmfdes.c` Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com> --- client/src/cmdhfmfdes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c index 90062a0db..f082fd8b7 100644 --- a/client/src/cmdhfmfdes.c +++ b/client/src/cmdhfmfdes.c @@ -2232,8 +2232,8 @@ static int CmdHF14ADesBruteApps(const char *Cmd) { break; } - float progress = 100.00 * (float)(id - idStart) / ((float)(idEnd - idStart)); - PrintAndLogEx(INPLACE, "Progress " _YELLOW_("%0.01f") " %% current AID: %06X", progress, id); + float progress = 100.0 * (float)(id - idStart) / ((float)(idEnd - idStart)); + PrintAndLogEx(INPLACE, "Brute AID Progress " _YELLOW_("%0.1ff") " %% current AID: %06X", progress, id); res = DesfireSelectAIDHexNoFieldOn(&dctx, id); From 0dacb9d455bef16f2281d407411db9ec543fea21 Mon Sep 17 00:00:00 2001 From: ry4000 <154689120+ry4000@users.noreply.github.com> Date: Mon, 3 Nov 2025 15:17:34 +1100 Subject: [PATCH 4/7] R&Y: Test Update in `cmdhfmfdes.c` Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com> --- client/src/cmdhfmfdes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c index f082fd8b7..529c062f7 100644 --- a/client/src/cmdhfmfdes.c +++ b/client/src/cmdhfmfdes.c @@ -2232,8 +2232,8 @@ static int CmdHF14ADesBruteApps(const char *Cmd) { break; } - float progress = 100.0 * (float)(id - idStart) / ((float)(idEnd - idStart)); - PrintAndLogEx(INPLACE, "Brute AID Progress " _YELLOW_("%0.1ff") " %% current AID: %06X", progress, id); + float progress = 100.000 * (float)(id - idStart) / ((float)(idEnd - idStart)); + PrintAndLogEx(INPLACE, "Brute DESFire AID Progress " _YELLOW_("%0.1ff") " %% current AID: %06X", progress, id); res = DesfireSelectAIDHexNoFieldOn(&dctx, id); From a2d22fd3c4a2896ad0a8d576b24bb311c458f18d Mon Sep 17 00:00:00 2001 From: ry4000 <154689120+ry4000@users.noreply.github.com> Date: Mon, 3 Nov 2025 15:23:39 +1100 Subject: [PATCH 5/7] R&Y: Test Update to `cmdhfmfdes.c` Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com> --- client/src/cmdhfmfdes.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c index 529c062f7..fcf88fe86 100644 --- a/client/src/cmdhfmfdes.c +++ b/client/src/cmdhfmfdes.c @@ -2232,14 +2232,14 @@ static int CmdHF14ADesBruteApps(const char *Cmd) { break; } - float progress = 100.000 * (float)(id - idStart) / ((float)(idEnd - idStart)); - PrintAndLogEx(INPLACE, "Brute DESFire AID Progress " _YELLOW_("%0.1ff") " %% current AID: %06X", progress, id); + float progress = 100.0 * (float)(id - idStart) / ((float)(idEnd - idStart)); + PrintAndLogEx(INPLACE, "Brute DESFire AID Progress " _YELLOW_("%0.001f") " %% current AID: %06X", progress, id); res = DesfireSelectAIDHexNoFieldOn(&dctx, id); if (res == PM3_SUCCESS) { printf("\33[2K\r"); // clear current line before printing - PrintAndLogEx(SUCCESS, "Found New DESFire Application ID " _GREEN_("%06X"), id); + PrintAndLogEx(SUCCESS, "Found New DESFire AID " _GREEN_("%06X"), id); } } From e71e0cf46fcef7f8128dd1da1c0f2f880f5cca57 Mon Sep 17 00:00:00 2001 From: ry4000 <154689120+ry4000@users.noreply.github.com> Date: Mon, 3 Nov 2025 15:36:16 +1100 Subject: [PATCH 6/7] R&Y: Update Progress Interval in `cmdhfmfdes.c` `hf mfdes bruteaid` progress will intervally show the bruteforce AID progress from 0.0% to 100.0%. Other text updates have also been made. Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com> --- client/src/cmdhfmfdes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c index fcf88fe86..d10c011ab 100644 --- a/client/src/cmdhfmfdes.c +++ b/client/src/cmdhfmfdes.c @@ -2233,7 +2233,7 @@ static int CmdHF14ADesBruteApps(const char *Cmd) { } float progress = 100.0 * (float)(id - idStart) / ((float)(idEnd - idStart)); - PrintAndLogEx(INPLACE, "Brute DESFire AID Progress " _YELLOW_("%0.001f") " %% current AID: %06X", progress, id); + PrintAndLogEx(INPLACE, "Brute DESFire AID Progress " _YELLOW_("%0.1f") " %% current AID: %06X", progress, id); res = DesfireSelectAIDHexNoFieldOn(&dctx, id); @@ -2251,7 +2251,7 @@ static int CmdHF14ADesBruteApps(const char *Cmd) { // MIAFRE DESFire Authentication // keys: -// NR DESC KEYLENGHT +// NR DESC KEYLENGTH // ------------------------ // 1 = DES 8 // 2 = 3DES 16 From 515f7590cd0e56cc0ccb932be9c32a5215c0e503 Mon Sep 17 00:00:00 2001 From: ry4000 <154689120+ry4000@users.noreply.github.com> Date: Mon, 3 Nov 2025 15:38:06 +1100 Subject: [PATCH 7/7] R&Y: Corrected ITSO AID in `aid_desfire.json` `F40113` was incorrectly listed twice; the duplicate was corrected to `F40114` with apologies. Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com> --- client/resources/aid_desfire.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/resources/aid_desfire.json b/client/resources/aid_desfire.json index 0d9c39ce3..915498480 100644 --- a/client/resources/aid_desfire.json +++ b/client/resources/aid_desfire.json @@ -1593,7 +1593,7 @@ }, { - "AID": "F40113", + "AID": "F40114", "Vendor": "ITSO Ltd", "Country": "GB", "Name": "ITSO Smartcard / The Key Card / touch Card (GBR)",