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

improved staticnonce tristate processing

Browse source
This commit is contained in:
iceman1001 2020-09-11 16:15:58 +02:00
commit 5b695153b6
4 changed files with 37 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

29
armsrc/mifarecmd.c
View file

@ -2348,29 +2348,29 @@ OUT:
void MifareHasStaticNonce(void) { void MifareHasStaticNonce(void) {
// variables // variables
int retval = PM3_SUCCESS, len; int retval = PM3_SUCCESS;
uint32_t nt = 0;
uint32_t nt = 0 ;
uint8_t rec[1] = {0x00};
uint8_t recpar[1] = {0x00};
uint8_t *uid = BigBuf_malloc(10); uint8_t *uid = BigBuf_malloc(10);
uint8_t data[1] = {0x00}; uint8_t data[1] = { NONCE_FAIL };
struct Crypto1State mpcs = {0, 0}; struct Crypto1State mpcs = {0, 0};
struct Crypto1State *pcs; struct Crypto1State *pcs;
pcs = &mpcs; pcs = &mpcs;
iso14a_card_select_t card_info;
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN); iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
for (int i = 0; i < 3; i++) { uint8_t counter = 0;
for (uint8_t i = 0; i < 3; i++) {
iso14a_card_select_t card_info;
if (!iso14443a_select_card(uid, &card_info, NULL, true, 0, true)) { if (!iso14443a_select_card(uid, &card_info, NULL, true, 0, true)) {
retval = PM3_ESOFT; retval = PM3_ESOFT;
goto OUT; goto OUT;
} }
uint8_t rec[1] = {0x00};
uint8_t recpar[1] = {0x00};
// Transmit MIFARE_CLASSIC_AUTH 0x60, block 0 // Transmit MIFARE_CLASSIC_AUTH 0x60, block 0
len = mifare_sendcmd_short(pcs, false, MIFARE_AUTH_KEYA, 0, rec, recpar, NULL); int len = mifare_sendcmd_short(pcs, false, MIFARE_AUTH_KEYA, 0, rec, recpar, NULL);
if (len != 4) { if (len != 4) {
retval = PM3_ESOFT; retval = PM3_ESOFT;
goto OUT; goto OUT;
@ -2378,7 +2378,7 @@ void MifareHasStaticNonce(void) {
// Save the tag nonce (nt) // Save the tag nonce (nt)
if (nt == bytes_to_num(rec, 4)) { if (nt == bytes_to_num(rec, 4)) {
data[0]++; counter++;
} }
nt = bytes_to_num(rec, 4); nt = bytes_to_num(rec, 4);
@ -2389,6 +2389,13 @@ void MifareHasStaticNonce(void) {
CHK_TIMEOUT(); CHK_TIMEOUT();
} }
if (counter) {
Dbprintf("%u static nonce %08x", data[0], nt);
data[0] = NONCE_STATIC;
} else {
data[0] = NONCE_NORMAL;
}
OUT: OUT:
reply_ng(CMD_HF_MIFARE_STATIC_NONCE, retval, data, sizeof(data)); reply_ng(CMD_HF_MIFARE_STATIC_NONCE, retval, data, sizeof(data));
// turns off // turns off

13
client/src/cmdhf14a.c
View file

@ -1956,12 +1956,17 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) {
isMagic = detect_classic_magic(); isMagic = detect_classic_magic();
if (isMifareClassic) { if (isMifareClassic) {
int res = detect_classic_static_nonce(); int res = detect_classic_static_nonce();
if (res == 1) if (res == NONCE_STATIC)
PrintAndLogEx(SUCCESS, "Static nonce: " _YELLOW_("yes")); PrintAndLogEx(SUCCESS, "Static nonce: " _YELLOW_("yes"));
if (res == 2 && verbose)
PrintAndLogEx(SUCCESS, "Static nonce: " _RED_("fail")); if (res == NONCE_FAIL && verbose)
if (res != 1) { // not static PrintAndLogEx(SUCCESS, "Static nonce: " _RED_("read failed"));
if (res == NONCE_NORMAL) {
// not static
res = detect_classic_prng(); res = detect_classic_prng();
if (res == 1) if (res == 1)
PrintAndLogEx(SUCCESS, "Prng detection: " _GREEN_("weak")); PrintAndLogEx(SUCCESS, "Prng detection: " _GREEN_("weak"));

13
client/src/mifare/mifarehost.c
View file

@ -1144,19 +1144,14 @@ int detect_classic_static_nonce(void) {
clearCommandBuffer(); clearCommandBuffer();
SendCommandNG(CMD_HF_MIFARE_STATIC_NONCE, NULL, 0); SendCommandNG(CMD_HF_MIFARE_STATIC_NONCE, NULL, 0);
PacketResponseNG resp; PacketResponseNG resp;
if (WaitForResponseTimeout(CMD_HF_MIFARE_STATIC_NONCE, &resp, 1000)) {
if (WaitForResponseTimeout(CMD_HF_MIFARE_STATIC_NONCE, &resp, 500)) {
if (resp.status == PM3_ESOFT) if (resp.status == PM3_ESOFT)
return 2; return NONCE_FAIL;
if (resp.data.asBytes[0] == 0) return resp.data.asBytes[0];
return 0;
if (resp.data.asBytes[0] != 0)
return 1;
} }
return 2; return NONCE_FAIL;
} }
/* try to see if card responses to "chinese magic backdoor" commands. */ /* try to see if card responses to "chinese magic backdoor" commands. */

5
include/pm3_cmd.h
View file

@ -710,6 +710,11 @@ typedef struct {
#define MODE_EXIT_AFTER_MAC 1 #define MODE_EXIT_AFTER_MAC 1
#define MODE_FULLSIM 2 #define MODE_FULLSIM 2
// Static Nonce detection
#define NONCE_FAIL 0x01
#define NONCE_NORMAL 0x02
#define NONCE_STATIC 0x03
// Dbprintf flags // Dbprintf flags
#define FLAG_RAWPRINT 0x00 #define FLAG_RAWPRINT 0x00
#define FLAG_LOG 0x01 #define FLAG_LOG 0x01