mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-20 13:23:51 -07:00
make style
This commit is contained in:
parent
0d9223a547
commit
0373696662
483 changed files with 56514 additions and 52451 deletions
|
@ -10,7 +10,8 @@
|
|||
#include "mifarehost.h"
|
||||
#include "cmdmain.h"
|
||||
|
||||
int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
|
||||
int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key)
|
||||
{
|
||||
uint32_t uid = 0;
|
||||
uint32_t nt = 0, nr = 0, ar = 0;
|
||||
uint64_t par_list = 0, ks_list = 0;
|
||||
|
@ -32,15 +33,18 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
|
|||
|
||||
//flush queue
|
||||
while (ukbhit()) {
|
||||
int gc = getchar(); (void)gc;
|
||||
int gc = getchar();
|
||||
(void)gc;
|
||||
return -5;
|
||||
}
|
||||
|
||||
// wait cycle
|
||||
while (true) {
|
||||
printf("."); fflush(stdout);
|
||||
printf(".");
|
||||
fflush(stdout);
|
||||
if (ukbhit()) {
|
||||
int gc = getchar(); (void)gc;
|
||||
int gc = getchar();
|
||||
(void)gc;
|
||||
return -5;
|
||||
}
|
||||
|
||||
|
@ -75,7 +79,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
|
|||
}
|
||||
|
||||
// only parity zero attack
|
||||
if (par_list == 0 ) {
|
||||
if (par_list == 0) {
|
||||
qsort(keylist, keycount, sizeof(*keylist), compare_uint64);
|
||||
keycount = intersection(last_keylist, keylist);
|
||||
if (keycount == 0) {
|
||||
|
@ -96,9 +100,9 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
|
|||
int size = keycount - i > max_keys ? max_keys : keycount - i;
|
||||
for (int j = 0; j < size; j++) {
|
||||
if (par_list == 0) {
|
||||
num_to_bytes(last_keylist[i*max_keys + j], 6, keyBlock+(j*6));
|
||||
num_to_bytes(last_keylist[i * max_keys + j], 6, keyBlock + (j * 6));
|
||||
} else {
|
||||
num_to_bytes(keylist[i*max_keys + j], 6, keyBlock+(j*6));
|
||||
num_to_bytes(keylist[i * max_keys + j], 6, keyBlock + (j * 6));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -120,7 +124,8 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
|
|||
free(keylist);
|
||||
return 0;
|
||||
}
|
||||
int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){
|
||||
int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key)
|
||||
{
|
||||
*key = -1;
|
||||
UsbCommand c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType << 8)), clear_trace, keycnt}};
|
||||
memcpy(c.d.asBytes, keyBlock, 6 * keycnt);
|
||||
|
@ -137,22 +142,24 @@ int mfCheckKeys(uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keyc
|
|||
// 0 == ok all keys found
|
||||
// 1 ==
|
||||
// 2 == Time-out, aborting
|
||||
int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk, uint8_t strategy,
|
||||
uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory) {
|
||||
int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk, uint8_t strategy,
|
||||
uint32_t size, uint8_t *keyBlock, sector_t *e_sector, bool use_flashmemory)
|
||||
{
|
||||
|
||||
uint64_t t2 = msclock();
|
||||
uint32_t timeout = 0;
|
||||
|
||||
// send keychunk
|
||||
UsbCommand c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12) ), ((use_flashmemory << 8) | strategy), size}};
|
||||
UsbCommand c = {CMD_MIFARE_CHKKEYS_FAST, { (sectorsCnt | (firstChunk << 8) | (lastChunk << 12)), ((use_flashmemory << 8) | strategy), size}};
|
||||
memcpy(c.d.asBytes, keyBlock, 6 * size);
|
||||
clearCommandBuffer();
|
||||
SendCommand(&c);
|
||||
UsbCommand resp;
|
||||
|
||||
while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
|
||||
while (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
|
||||
timeout++;
|
||||
printf("."); fflush(stdout);
|
||||
printf(".");
|
||||
fflush(stdout);
|
||||
// max timeout for one chunk of 85keys, 60*3sec = 180seconds
|
||||
// s70 with 40*2 keys to check, 80*85 = 6800 auth.
|
||||
// takes about 97s, still some margin before abort
|
||||
|
@ -166,47 +173,47 @@ int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
|
|||
// time to convert the returned data.
|
||||
uint8_t curr_keys = resp.arg[0];
|
||||
|
||||
PrintAndLogEx(SUCCESS, "\nChunk: %.1fs | found %u/%u keys (%u)", (float)(t2/1000.0), curr_keys, (sectorsCnt<<1), size);
|
||||
PrintAndLogEx(SUCCESS, "\nChunk: %.1fs | found %u/%u keys (%u)", (float)(t2 / 1000.0), curr_keys, (sectorsCnt << 1), size);
|
||||
|
||||
// all keys?
|
||||
if ( curr_keys == sectorsCnt*2 || lastChunk ) {
|
||||
if (curr_keys == sectorsCnt * 2 || lastChunk) {
|
||||
|
||||
// success array. each byte is status of key
|
||||
uint8_t arr[80];
|
||||
uint64_t foo = 0;
|
||||
uint16_t bar = 0;
|
||||
foo = bytes_to_num(resp.d.asBytes+480, 8);
|
||||
foo = bytes_to_num(resp.d.asBytes + 480, 8);
|
||||
bar = (resp.d.asBytes[489] << 8 | resp.d.asBytes[488]);
|
||||
|
||||
for (uint8_t i = 0; i < 64; i++)
|
||||
arr[i] = (foo >> i) & 0x1;
|
||||
|
||||
for (uint8_t i = 0; i < 16; i++)
|
||||
arr[i+64] = (bar >> i) & 0x1;
|
||||
arr[i + 64] = (bar >> i) & 0x1;
|
||||
|
||||
// initialize storage for found keys
|
||||
icesector_t *tmp = calloc(sectorsCnt, sizeof(icesector_t));
|
||||
if (tmp == NULL)
|
||||
return 1;
|
||||
memcpy(tmp, resp.d.asBytes, sectorsCnt * sizeof(icesector_t) );
|
||||
memcpy(tmp, resp.d.asBytes, sectorsCnt * sizeof(icesector_t));
|
||||
|
||||
for ( int i = 0; i < sectorsCnt; i++) {
|
||||
for (int i = 0; i < sectorsCnt; i++) {
|
||||
// key A
|
||||
if ( !e_sector[i].foundKey[0] ) {
|
||||
e_sector[i].Key[0] = bytes_to_num( tmp[i].keyA, 6);
|
||||
e_sector[i].foundKey[0] = arr[ (i*2) ];
|
||||
if (!e_sector[i].foundKey[0]) {
|
||||
e_sector[i].Key[0] = bytes_to_num(tmp[i].keyA, 6);
|
||||
e_sector[i].foundKey[0] = arr[(i * 2) ];
|
||||
}
|
||||
// key B
|
||||
if ( !e_sector[i].foundKey[1] ) {
|
||||
e_sector[i].Key[1] = bytes_to_num( tmp[i].keyB, 6);
|
||||
e_sector[i].foundKey[1] = arr[ (i*2) + 1 ];
|
||||
if (!e_sector[i].foundKey[1]) {
|
||||
e_sector[i].Key[1] = bytes_to_num(tmp[i].keyB, 6);
|
||||
e_sector[i].foundKey[1] = arr[(i * 2) + 1 ];
|
||||
}
|
||||
}
|
||||
free(tmp);
|
||||
|
||||
if ( curr_keys == sectorsCnt*2 )
|
||||
if (curr_keys == sectorsCnt * 2)
|
||||
return 0;
|
||||
if ( lastChunk )
|
||||
if (lastChunk)
|
||||
return 1;
|
||||
}
|
||||
return 1;
|
||||
|
@ -214,11 +221,12 @@ int mfCheckKeys_fast( uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
|
|||
|
||||
// PM3 imp of J-Run mf_key_brute (part 2)
|
||||
// ref: https://github.com/J-Run/mf_key_brute
|
||||
int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey){
|
||||
int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey)
|
||||
{
|
||||
|
||||
#define KEYS_IN_BLOCK 85
|
||||
#define KEYBLOCK_SIZE 510
|
||||
#define CANDIDATE_SIZE 0xFFFF * 6
|
||||
#define KEYS_IN_BLOCK 85
|
||||
#define KEYBLOCK_SIZE 510
|
||||
#define CANDIDATE_SIZE 0xFFFF * 6
|
||||
uint8_t found = false;
|
||||
uint64_t key64 = 0;
|
||||
uint8_t candidates[CANDIDATE_SIZE] = {0x00};
|
||||
|
@ -238,7 +246,7 @@ int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultk
|
|||
candidates[5 + j] = key[5];
|
||||
}
|
||||
uint32_t counter, i;
|
||||
for ( i = 0, counter = 1; i < CANDIDATE_SIZE; i += KEYBLOCK_SIZE, ++counter){
|
||||
for (i = 0, counter = 1; i < CANDIDATE_SIZE; i += KEYBLOCK_SIZE, ++counter) {
|
||||
|
||||
key64 = 0;
|
||||
|
||||
|
@ -253,16 +261,17 @@ int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultk
|
|||
}
|
||||
|
||||
// progress
|
||||
if ( counter % 20 == 0 )
|
||||
PrintAndLogEx(SUCCESS, "tried : %s.. \t %u keys", sprint_hex(candidates + i, 6), counter * KEYS_IN_BLOCK );
|
||||
if (counter % 20 == 0)
|
||||
PrintAndLogEx(SUCCESS, "tried : %s.. \t %u keys", sprint_hex(candidates + i, 6), counter * KEYS_IN_BLOCK);
|
||||
}
|
||||
return found;
|
||||
}
|
||||
|
||||
// Compare 16 Bits out of cryptostate
|
||||
int Compare16Bits(const void * a, const void * b) {
|
||||
if ((*(uint64_t*)b & 0x00ff000000ff0000) == (*(uint64_t*)a & 0x00ff000000ff0000)) return 0;
|
||||
if ((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000)) return 1;
|
||||
int Compare16Bits(const void *a, const void *b)
|
||||
{
|
||||
if ((*(uint64_t *)b & 0x00ff000000ff0000) == (*(uint64_t *)a & 0x00ff000000ff0000)) return 0;
|
||||
if ((*(uint64_t *)b & 0x00ff000000ff0000) > (*(uint64_t *)a & 0x00ff000000ff0000)) return 1;
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -273,12 +282,13 @@ void
|
|||
__attribute__((force_align_arg_pointer))
|
||||
#endif
|
||||
#endif
|
||||
*nested_worker_thread(void *arg) {
|
||||
*nested_worker_thread(void *arg)
|
||||
{
|
||||
struct Crypto1State *p1;
|
||||
StateList_t *statelist = arg;
|
||||
statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid);
|
||||
|
||||
for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; p1++) {};
|
||||
for (p1 = statelist->head.slhead; * (uint64_t *)p1 != 0; p1++) {};
|
||||
|
||||
statelist->len = p1 - statelist->head.slhead;
|
||||
statelist->tail.sltail = --p1;
|
||||
|
@ -287,7 +297,8 @@ __attribute__((force_align_arg_pointer))
|
|||
return statelist->head.slhead;
|
||||
}
|
||||
|
||||
int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * resultKey, bool calibrate) {
|
||||
int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKey, bool calibrate)
|
||||
{
|
||||
uint16_t i;
|
||||
uint32_t uid;
|
||||
UsbCommand resp;
|
||||
|
@ -309,7 +320,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
|
|||
statelists[i].blockNo = resp.arg[2] & 0xff;
|
||||
statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;
|
||||
statelists[i].uid = uid;
|
||||
memcpy(&statelists[i].nt, (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);
|
||||
memcpy(&statelists[i].nt, (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);
|
||||
memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);
|
||||
}
|
||||
|
||||
|
@ -322,7 +333,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
|
|||
|
||||
// wait for threads to terminate:
|
||||
for (i = 0; i < 2; i++)
|
||||
pthread_join(thread_id[i], (void*)&statelists[i].head.slhead);
|
||||
pthread_join(thread_id[i], (void *)&statelists[i].head.slhead);
|
||||
|
||||
// the first 16 Bits of the cryptostate already contain part of our key.
|
||||
// Create the intersection of the two lists based on these 16 Bits and
|
||||
|
@ -335,28 +346,27 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
|
|||
|
||||
struct Crypto1State savestate, *savep = &savestate;
|
||||
savestate = *p1;
|
||||
while(Compare16Bits(p1, savep) == 0 && p1 <= statelists[0].tail.sltail) {
|
||||
while (Compare16Bits(p1, savep) == 0 && p1 <= statelists[0].tail.sltail) {
|
||||
*p3 = *p1;
|
||||
lfsr_rollback_word(p3, statelists[0].nt ^ statelists[0].uid, 0);
|
||||
p3++;
|
||||
p1++;
|
||||
}
|
||||
savestate = *p2;
|
||||
while(Compare16Bits(p2, savep) == 0 && p2 <= statelists[1].tail.sltail) {
|
||||
while (Compare16Bits(p2, savep) == 0 && p2 <= statelists[1].tail.sltail) {
|
||||
*p4 = *p2;
|
||||
lfsr_rollback_word(p4, statelists[1].nt ^ statelists[1].uid, 0);
|
||||
p4++;
|
||||
p2++;
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
while (Compare16Bits(p1, p2) == -1) p1++;
|
||||
while (Compare16Bits(p1, p2) == 1) p2++;
|
||||
}
|
||||
}
|
||||
|
||||
*(uint64_t*)p3 = -1;
|
||||
*(uint64_t*)p4 = -1;
|
||||
*(uint64_t *)p3 = -1;
|
||||
*(uint64_t *)p4 = -1;
|
||||
statelists[0].len = p3 - statelists[0].head.slhead;
|
||||
statelists[1].len = p4 - statelists[1].head.slhead;
|
||||
statelists[0].tail.sltail = --p3;
|
||||
|
@ -371,13 +381,13 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
|
|||
|
||||
//statelists[0].tail.keytail = --p7;
|
||||
uint32_t keycnt = statelists[0].len;
|
||||
if ( keycnt == 0 ) goto out;
|
||||
if (keycnt == 0) goto out;
|
||||
|
||||
memset(resultKey, 0, 6);
|
||||
uint64_t key64 = -1;
|
||||
|
||||
// The list may still contain several key candidates. Test each of them with mfCheckKeys
|
||||
uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
|
||||
uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE / 6) ? (USB_CMD_DATA_SIZE / 6) : keycnt;
|
||||
uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00};
|
||||
|
||||
for (int i = 0; i < keycnt; i += max_keys) {
|
||||
|
@ -395,19 +405,19 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
|
|||
num_to_bytes(key64, 6, resultKey);
|
||||
|
||||
PrintAndLogEx(SUCCESS, "target block:%3u key type: %c -- found valid key [%012" PRIx64 "]",
|
||||
(uint16_t)resp.arg[2] & 0xff,
|
||||
(resp.arg[2] >> 8) ? 'B' : 'A',
|
||||
key64
|
||||
);
|
||||
(uint16_t)resp.arg[2] & 0xff,
|
||||
(resp.arg[2] >> 8) ? 'B' : 'A',
|
||||
key64
|
||||
);
|
||||
return -5;
|
||||
}
|
||||
}
|
||||
|
||||
out:
|
||||
PrintAndLogEx(SUCCESS, "target block:%3u key type: %c",
|
||||
(uint16_t)resp.arg[2] & 0xff,
|
||||
(resp.arg[2] >> 8) ? 'B' : 'A'
|
||||
);
|
||||
(uint16_t)resp.arg[2] & 0xff,
|
||||
(resp.arg[2] >> 8) ? 'B' : 'A'
|
||||
);
|
||||
|
||||
free(statelists[0].head.slhead);
|
||||
free(statelists[1].head.slhead);
|
||||
|
@ -415,7 +425,8 @@ out:
|
|||
}
|
||||
|
||||
// MIFARE
|
||||
int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data) {
|
||||
int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data)
|
||||
{
|
||||
|
||||
UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
|
||||
memcpy(c.d.asBytes, key, 6);
|
||||
|
@ -441,7 +452,8 @@ int mfReadSector(uint8_t sectorNo, uint8_t keyType, uint8_t *key, uint8_t *data)
|
|||
}
|
||||
|
||||
// EMULATOR
|
||||
int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
|
||||
int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount)
|
||||
{
|
||||
UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};
|
||||
clearCommandBuffer();
|
||||
SendCommand(&c);
|
||||
|
@ -451,11 +463,13 @@ int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
|
||||
int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount)
|
||||
{
|
||||
return mfEmlSetMem_xt(data, blockNum, blocksCount, 16);
|
||||
}
|
||||
|
||||
int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
|
||||
int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth)
|
||||
{
|
||||
UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}};
|
||||
memcpy(c.d.asBytes, data, blocksCount * blockBtWidth);
|
||||
clearCommandBuffer();
|
||||
|
@ -464,7 +478,8 @@ int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidt
|
|||
}
|
||||
|
||||
// "MAGIC" CARD
|
||||
int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard) {
|
||||
int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard)
|
||||
{
|
||||
|
||||
uint8_t params = MAGIC_SINGLE;
|
||||
uint8_t block0[16];
|
||||
|
@ -482,22 +497,23 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_
|
|||
// Mifare UID BCC
|
||||
block0[4] = block0[0] ^ block0[1] ^ block0[2] ^ block0[3];
|
||||
// mifare classic SAK(byte 5) and ATQA(byte 6 and 7, reversed)
|
||||
if ( sak != NULL )
|
||||
if (sak != NULL)
|
||||
block0[5] = sak[0];
|
||||
|
||||
if ( atqa != NULL ) {
|
||||
if (atqa != NULL) {
|
||||
block0[6] = atqa[1];
|
||||
block0[7] = atqa[0];
|
||||
}
|
||||
PrintAndLogEx(SUCCESS, "new block 0: %s", sprint_hex(block0,16));
|
||||
PrintAndLogEx(SUCCESS, "new block 0: %s", sprint_hex(block0, 16));
|
||||
|
||||
if ( wipecard ) params |= MAGIC_WIPE;
|
||||
if ( oldUID == NULL) params |= MAGIC_UID;
|
||||
if (wipecard) params |= MAGIC_WIPE;
|
||||
if (oldUID == NULL) params |= MAGIC_UID;
|
||||
|
||||
return mfCSetBlock(0, block0, oldUID, params);
|
||||
}
|
||||
|
||||
int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
|
||||
int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params)
|
||||
{
|
||||
|
||||
uint8_t isOK = 0;
|
||||
UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}};
|
||||
|
@ -518,7 +534,8 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
|
||||
int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params)
|
||||
{
|
||||
uint8_t isOK = 0;
|
||||
UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};
|
||||
clearCommandBuffer();
|
||||
|
@ -562,23 +579,27 @@ uint32_t nr_enc = 0; // encrypted reader challenge
|
|||
uint32_t ar_enc = 0; // encrypted reader response
|
||||
uint32_t at_enc = 0; // encrypted tag response
|
||||
|
||||
int isTraceCardEmpty(void) {
|
||||
int isTraceCardEmpty(void)
|
||||
{
|
||||
return ((traceCard[0] == 0) && (traceCard[1] == 0) && (traceCard[2] == 0) && (traceCard[3] == 0));
|
||||
}
|
||||
|
||||
int isBlockEmpty(int blockN) {
|
||||
int isBlockEmpty(int blockN)
|
||||
{
|
||||
for (int i = 0; i < 16; i++)
|
||||
if (traceCard[blockN * 16 + i] != 0) return 0;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
int isBlockTrailer(int blockN) {
|
||||
int isBlockTrailer(int blockN)
|
||||
{
|
||||
return ((blockN & 0x03) == 0x03);
|
||||
}
|
||||
|
||||
int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
|
||||
FILE * f;
|
||||
int loadTraceCard(uint8_t *tuid, uint8_t uidlen)
|
||||
{
|
||||
FILE *f;
|
||||
char buf[64] = {0x00};
|
||||
uint8_t buf8[64] = {0x00};
|
||||
int i, blockNum;
|
||||
|
@ -597,7 +618,7 @@ int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
|
|||
|
||||
blockNum = 0;
|
||||
|
||||
while (!feof(f)){
|
||||
while (!feof(f)) {
|
||||
|
||||
memset(buf, 0, sizeof(buf));
|
||||
if (fgets(buf, sizeof(buf), f) == NULL) {
|
||||
|
@ -608,7 +629,7 @@ int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
|
|||
return 2;
|
||||
}
|
||||
|
||||
if (strlen(buf) < 32){
|
||||
if (strlen(buf) < 32) {
|
||||
if (feof(f)) break;
|
||||
PrintAndLogEx(FAILED, "File content error. Block data must include 32 HEX symbols");
|
||||
if (f) {
|
||||
|
@ -631,13 +652,14 @@ int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
int saveTraceCard(void) {
|
||||
int saveTraceCard(void)
|
||||
{
|
||||
|
||||
if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;
|
||||
|
||||
FILE * f;
|
||||
FILE *f;
|
||||
f = fopen(traceFileName, "w+");
|
||||
if ( !f ) return 1;
|
||||
if (!f) return 1;
|
||||
|
||||
// given 4096 tracecard size, these loop will only match a 1024, 1kb card memory
|
||||
// 4086/16 == 256blocks.
|
||||
|
@ -646,7 +668,7 @@ int saveTraceCard(void) {
|
|||
fprintf(f, "%02X", *(traceCard + i * 16 + j));
|
||||
|
||||
// no extra line in the end
|
||||
if ( i < 255 )
|
||||
if (i < 255)
|
||||
fprintf(f, "\n");
|
||||
}
|
||||
fflush(f);
|
||||
|
@ -654,7 +676,8 @@ int saveTraceCard(void) {
|
|||
return 0;
|
||||
}
|
||||
//
|
||||
int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {
|
||||
int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile)
|
||||
{
|
||||
|
||||
if (traceCrypto1)
|
||||
crypto1_destroy(traceCrypto1);
|
||||
|
@ -668,12 +691,13 @@ int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool
|
|||
traceCard[5] = sak;
|
||||
memcpy(&traceCard[6], atqa, 2);
|
||||
traceCurBlock = 0;
|
||||
cuid = bytes_to_num(tuid + (uidlen-4), 4);
|
||||
cuid = bytes_to_num(tuid + (uidlen - 4), 4);
|
||||
traceState = TRACE_IDLE;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted){
|
||||
void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted)
|
||||
{
|
||||
uint8_t bt = 0;
|
||||
int i;
|
||||
|
||||
|
@ -690,7 +714,8 @@ void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool i
|
|||
}
|
||||
}
|
||||
|
||||
int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
|
||||
int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile)
|
||||
{
|
||||
|
||||
if (traceState == TRACE_ERROR)
|
||||
return 1;
|
||||
|
@ -712,161 +737,162 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
|
|||
}
|
||||
|
||||
switch (traceState) {
|
||||
case TRACE_IDLE:
|
||||
// check packet crc16!
|
||||
if ((len >= 4) && (!check_crc(CRC_14443_A, data, len))) {
|
||||
PrintAndLogEx(NORMAL, "DEC| CRC ERROR!!!");
|
||||
AddLogLine(logHexFileName, "DEC| ", "CRC ERROR!!!");
|
||||
traceState = TRACE_ERROR; // do not decrypt the next commands
|
||||
return 1;
|
||||
}
|
||||
|
||||
// AUTHENTICATION
|
||||
if ((len == 4) && ((data[0] == MIFARE_AUTH_KEYA) || (data[0] == MIFARE_AUTH_KEYB))) {
|
||||
traceState = TRACE_AUTH1;
|
||||
traceCurBlock = data[1];
|
||||
traceCurKey = data[0] == 60 ? 1:0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// READ
|
||||
if ((len == 4) && ((data[0] == ISO14443A_CMD_READBLOCK))) {
|
||||
traceState = TRACE_READ_DATA;
|
||||
traceCurBlock = data[1];
|
||||
return 0;
|
||||
}
|
||||
|
||||
// WRITE
|
||||
if ((len == 4) && ((data[0] == ISO14443A_CMD_WRITEBLOCK))) {
|
||||
traceState = TRACE_WRITE_OK;
|
||||
traceCurBlock = data[1];
|
||||
return 0;
|
||||
}
|
||||
|
||||
// HALT
|
||||
if ((len == 4) && ((data[0] == ISO14443A_CMD_HALT) && (data[1] == 0x00))) {
|
||||
traceState = TRACE_ERROR; // do not decrypt the next commands
|
||||
return 0;
|
||||
}
|
||||
return 0;
|
||||
|
||||
case TRACE_READ_DATA:
|
||||
if (len == 18) {
|
||||
traceState = TRACE_IDLE;
|
||||
|
||||
if (isBlockTrailer(traceCurBlock)) {
|
||||
memcpy(traceCard + traceCurBlock * 16 + 6, data + 6, 4);
|
||||
} else {
|
||||
memcpy(traceCard + traceCurBlock * 16, data, 16);
|
||||
case TRACE_IDLE:
|
||||
// check packet crc16!
|
||||
if ((len >= 4) && (!check_crc(CRC_14443_A, data, len))) {
|
||||
PrintAndLogEx(NORMAL, "DEC| CRC ERROR!!!");
|
||||
AddLogLine(logHexFileName, "DEC| ", "CRC ERROR!!!");
|
||||
traceState = TRACE_ERROR; // do not decrypt the next commands
|
||||
return 1;
|
||||
}
|
||||
|
||||
// AUTHENTICATION
|
||||
if ((len == 4) && ((data[0] == MIFARE_AUTH_KEYA) || (data[0] == MIFARE_AUTH_KEYB))) {
|
||||
traceState = TRACE_AUTH1;
|
||||
traceCurBlock = data[1];
|
||||
traceCurKey = data[0] == 60 ? 1 : 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// READ
|
||||
if ((len == 4) && ((data[0] == ISO14443A_CMD_READBLOCK))) {
|
||||
traceState = TRACE_READ_DATA;
|
||||
traceCurBlock = data[1];
|
||||
return 0;
|
||||
}
|
||||
|
||||
// WRITE
|
||||
if ((len == 4) && ((data[0] == ISO14443A_CMD_WRITEBLOCK))) {
|
||||
traceState = TRACE_WRITE_OK;
|
||||
traceCurBlock = data[1];
|
||||
return 0;
|
||||
}
|
||||
|
||||
// HALT
|
||||
if ((len == 4) && ((data[0] == ISO14443A_CMD_HALT) && (data[1] == 0x00))) {
|
||||
traceState = TRACE_ERROR; // do not decrypt the next commands
|
||||
return 0;
|
||||
}
|
||||
if (wantSaveToEmlFile) saveTraceCard();
|
||||
return 0;
|
||||
} else {
|
||||
traceState = TRACE_ERROR;
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
case TRACE_WRITE_OK:
|
||||
if ((len == 1) && (data[0] == 0x0a)) {
|
||||
traceState = TRACE_WRITE_DATA;
|
||||
return 0;
|
||||
} else {
|
||||
traceState = TRACE_ERROR;
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
case TRACE_WRITE_DATA:
|
||||
if (len == 18) {
|
||||
traceState = TRACE_IDLE;
|
||||
memcpy(traceCard + traceCurBlock * 16, data, 16);
|
||||
if (wantSaveToEmlFile) saveTraceCard();
|
||||
return 0;
|
||||
} else {
|
||||
traceState = TRACE_ERROR;
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
case TRACE_AUTH1:
|
||||
if (len == 4) {
|
||||
traceState = TRACE_AUTH2;
|
||||
nt = bytes_to_num(data, 4);
|
||||
return 0;
|
||||
} else {
|
||||
traceState = TRACE_ERROR;
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
case TRACE_AUTH2:
|
||||
if (len == 8) {
|
||||
traceState = TRACE_AUTH_OK;
|
||||
nr_enc = bytes_to_num(data, 4);
|
||||
ar_enc = bytes_to_num(data + 4, 4);
|
||||
return 0;
|
||||
} else {
|
||||
traceState = TRACE_ERROR;
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
case TRACE_AUTH_OK:
|
||||
if (len == 4) {
|
||||
traceState = TRACE_IDLE;
|
||||
at_enc = bytes_to_num(data, 4);
|
||||
|
||||
// mfkey64 recover key.
|
||||
ks2 = ar_enc ^ prng_successor(nt, 64);
|
||||
ks3 = at_enc ^ prng_successor(nt, 96);
|
||||
revstate = lfsr_recovery64(ks2, ks3);
|
||||
lfsr_rollback_word(revstate, 0, 0);
|
||||
lfsr_rollback_word(revstate, 0, 0);
|
||||
lfsr_rollback_word(revstate, nr_enc, 1);
|
||||
lfsr_rollback_word(revstate, cuid ^ nt, 0);
|
||||
crypto1_get_lfsr(revstate, &key);
|
||||
PrintAndLogEx(SUCCESS, "found Key: [%012" PRIx64 "]", key);
|
||||
case TRACE_READ_DATA:
|
||||
if (len == 18) {
|
||||
traceState = TRACE_IDLE;
|
||||
|
||||
//if ( tryMfk64(cuid, nt, nr_enc, ar_enc, at_enc, &key) )
|
||||
AddLogUint64(logHexFileName, "Found Key: ", key);
|
||||
if (isBlockTrailer(traceCurBlock)) {
|
||||
memcpy(traceCard + traceCurBlock * 16 + 6, data + 6, 4);
|
||||
} else {
|
||||
memcpy(traceCard + traceCurBlock * 16, data, 16);
|
||||
}
|
||||
if (wantSaveToEmlFile) saveTraceCard();
|
||||
return 0;
|
||||
} else {
|
||||
traceState = TRACE_ERROR;
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
case TRACE_WRITE_OK:
|
||||
if ((len == 1) && (data[0] == 0x0a)) {
|
||||
traceState = TRACE_WRITE_DATA;
|
||||
return 0;
|
||||
} else {
|
||||
traceState = TRACE_ERROR;
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
case TRACE_WRITE_DATA:
|
||||
if (len == 18) {
|
||||
traceState = TRACE_IDLE;
|
||||
memcpy(traceCard + traceCurBlock * 16, data, 16);
|
||||
if (wantSaveToEmlFile) saveTraceCard();
|
||||
return 0;
|
||||
} else {
|
||||
traceState = TRACE_ERROR;
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
case TRACE_AUTH1:
|
||||
if (len == 4) {
|
||||
traceState = TRACE_AUTH2;
|
||||
nt = bytes_to_num(data, 4);
|
||||
return 0;
|
||||
} else {
|
||||
traceState = TRACE_ERROR;
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
case TRACE_AUTH2:
|
||||
if (len == 8) {
|
||||
traceState = TRACE_AUTH_OK;
|
||||
nr_enc = bytes_to_num(data, 4);
|
||||
ar_enc = bytes_to_num(data + 4, 4);
|
||||
return 0;
|
||||
} else {
|
||||
traceState = TRACE_ERROR;
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
case TRACE_AUTH_OK:
|
||||
if (len == 4) {
|
||||
traceState = TRACE_IDLE;
|
||||
at_enc = bytes_to_num(data, 4);
|
||||
|
||||
int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;
|
||||
if (isBlockEmpty((traceCurBlock & 0xFC) + 3))
|
||||
memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);
|
||||
// mfkey64 recover key.
|
||||
ks2 = ar_enc ^ prng_successor(nt, 64);
|
||||
ks3 = at_enc ^ prng_successor(nt, 96);
|
||||
revstate = lfsr_recovery64(ks2, ks3);
|
||||
lfsr_rollback_word(revstate, 0, 0);
|
||||
lfsr_rollback_word(revstate, 0, 0);
|
||||
lfsr_rollback_word(revstate, nr_enc, 1);
|
||||
lfsr_rollback_word(revstate, cuid ^ nt, 0);
|
||||
crypto1_get_lfsr(revstate, &key);
|
||||
PrintAndLogEx(SUCCESS, "found Key: [%012" PRIx64 "]", key);
|
||||
|
||||
// keytype A/B
|
||||
if (traceCurKey)
|
||||
num_to_bytes(key, 6, traceCard + blockShift + 10);
|
||||
else
|
||||
num_to_bytes(key, 6, traceCard + blockShift);
|
||||
//if ( tryMfk64(cuid, nt, nr_enc, ar_enc, at_enc, &key) )
|
||||
AddLogUint64(logHexFileName, "Found Key: ", key);
|
||||
|
||||
if (wantSaveToEmlFile)
|
||||
saveTraceCard();
|
||||
int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;
|
||||
if (isBlockEmpty((traceCurBlock & 0xFC) + 3))
|
||||
memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);
|
||||
|
||||
if (traceCrypto1)
|
||||
// keytype A/B
|
||||
if (traceCurKey)
|
||||
num_to_bytes(key, 6, traceCard + blockShift + 10);
|
||||
else
|
||||
num_to_bytes(key, 6, traceCard + blockShift);
|
||||
|
||||
if (wantSaveToEmlFile)
|
||||
saveTraceCard();
|
||||
|
||||
if (traceCrypto1)
|
||||
crypto1_destroy(traceCrypto1);
|
||||
|
||||
// set cryptosystem state
|
||||
traceCrypto1 = lfsr_recovery64(ks2, ks3);
|
||||
|
||||
} else {
|
||||
PrintAndLogEx(NORMAL, "[!] nested key recovery not implemented!\n");
|
||||
at_enc = bytes_to_num(data, 4);
|
||||
crypto1_destroy(traceCrypto1);
|
||||
|
||||
// set cryptosystem state
|
||||
traceCrypto1 = lfsr_recovery64(ks2, ks3);
|
||||
|
||||
} else {
|
||||
PrintAndLogEx(NORMAL, "[!] nested key recovery not implemented!\n");
|
||||
at_enc = bytes_to_num(data, 4);
|
||||
crypto1_destroy(traceCrypto1);
|
||||
traceState = TRACE_ERROR;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
traceState = TRACE_ERROR;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
traceState = TRACE_ERROR;
|
||||
return 1;
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){
|
||||
PrintAndLogEx(SUCCESS, "\nencrypted data: [%s]", sprint_hex(data, len) );
|
||||
int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len)
|
||||
{
|
||||
PrintAndLogEx(SUCCESS, "\nencrypted data: [%s]", sprint_hex(data, len));
|
||||
struct Crypto1State *s;
|
||||
ks2 = ar_enc ^ prng_successor(nt, 64);
|
||||
ks3 = at_enc ^ prng_successor(nt, 96);
|
||||
s = lfsr_recovery64(ks2, ks3);
|
||||
mf_crypto1_decrypt(s, data, len, false);
|
||||
PrintAndLogEx(SUCCESS, "decrypted data: [%s]", sprint_hex(data, len) );
|
||||
PrintAndLogEx(SUCCESS, "decrypted data: [%s]", sprint_hex(data, len));
|
||||
crypto1_destroy(s);
|
||||
return 0;
|
||||
}
|
||||
|
@ -878,7 +904,8 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data,
|
|||
* TRUE if tag uses WEAK prng (ie Now the NACK bug also needs to be present for Darkside attack)
|
||||
* FALSE is tag uses HARDEND prng (ie hardnested attack possible, with known key)
|
||||
*/
|
||||
int detect_classic_prng(void){
|
||||
int detect_classic_prng(void)
|
||||
{
|
||||
|
||||
UsbCommand resp, respA;
|
||||
uint8_t cmd[] = {MIFARE_AUTH_KEYA, 0x00};
|
||||
|
@ -896,7 +923,7 @@ int detect_classic_prng(void){
|
|||
}
|
||||
|
||||
// if select tag failed.
|
||||
if ( resp.arg[0] == 0 ) {
|
||||
if (resp.arg[0] == 0) {
|
||||
PrintAndLogEx(WARNING, "error: selecting tag failed, can't detect prng\n");
|
||||
return -2;
|
||||
}
|
||||
|
@ -922,14 +949,15 @@ returns:
|
|||
2 = has not nack bug
|
||||
3 = always leak nacks (clones)
|
||||
*/
|
||||
int detect_classic_nackbug(bool verbose){
|
||||
int detect_classic_nackbug(bool verbose)
|
||||
{
|
||||
|
||||
UsbCommand c = {CMD_MIFARE_NACK_DETECT, {0, 0, 0}};
|
||||
clearCommandBuffer();
|
||||
SendCommand(&c);
|
||||
UsbCommand resp;
|
||||
|
||||
if ( verbose )
|
||||
if (verbose)
|
||||
PrintAndLogEx(SUCCESS, "press pm3-button on the proxmark3 device to abort both proxmark3 and client.\n");
|
||||
|
||||
// for nice animation
|
||||
|
@ -945,16 +973,17 @@ int detect_classic_nackbug(bool verbose){
|
|||
printf(".");
|
||||
} else {
|
||||
printf(
|
||||
#if defined(__linux__) || (__APPLE__)
|
||||
"\e[32m\e[s%c\e[u\e[0m", star[ (staridx++ % 4) ]
|
||||
#else
|
||||
"."
|
||||
#endif
|
||||
#if defined(__linux__) || (__APPLE__)
|
||||
"\e[32m\e[s%c\e[u\e[0m", star[(staridx++ % 4) ]
|
||||
#else
|
||||
"."
|
||||
#endif
|
||||
);
|
||||
}
|
||||
fflush(stdout);
|
||||
if (ukbhit()) {
|
||||
int gc = getchar(); (void)gc;
|
||||
int gc = getchar();
|
||||
(void)gc;
|
||||
return -1;
|
||||
break;
|
||||
}
|
||||
|
@ -965,30 +994,40 @@ int detect_classic_nackbug(bool verbose){
|
|||
uint32_t auths = resp.arg[2];
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
|
||||
if ( verbose ) {
|
||||
if (verbose) {
|
||||
PrintAndLogEx(SUCCESS, "num of auth requests : %u", auths);
|
||||
PrintAndLogEx(SUCCESS, "num of received NACK : %u", nacks);
|
||||
}
|
||||
switch( ok ) {
|
||||
case 99 : PrintAndLogEx(WARNING, "button pressed. Aborted."); return 0;
|
||||
switch (ok) {
|
||||
case 99 :
|
||||
PrintAndLogEx(WARNING, "button pressed. Aborted.");
|
||||
return 0;
|
||||
case 96 :
|
||||
case 98 : {
|
||||
if (verbose)
|
||||
PrintAndLogEx(FAILED, "card random number generator is not predictable.");
|
||||
PrintAndLogEx(WARNING, "detection failed");
|
||||
return 2;
|
||||
}
|
||||
if (verbose)
|
||||
PrintAndLogEx(FAILED, "card random number generator is not predictable.");
|
||||
PrintAndLogEx(WARNING, "detection failed");
|
||||
return 2;
|
||||
}
|
||||
case 97 : {
|
||||
if (verbose) {
|
||||
PrintAndLogEx(FAILED, "card random number generator seems to be based on the well-known generating polynomial");
|
||||
PrintAndLogEx(NORMAL, "[- ]with 16 effective bits only, but shows unexpected behavior, try again.");
|
||||
}
|
||||
return 2;
|
||||
}
|
||||
case 2 : PrintAndLogEx(SUCCESS, _GREEN_(always leak NACK detected)); return 3;
|
||||
case 1 : PrintAndLogEx(SUCCESS, _GREEN_(NACK bug detected)); return 1;
|
||||
case 0 : PrintAndLogEx(SUCCESS, "No NACK bug detected"); return 2;
|
||||
default : PrintAndLogEx(WARNING, "errorcode from device [%i]", ok); return 0;
|
||||
if (verbose) {
|
||||
PrintAndLogEx(FAILED, "card random number generator seems to be based on the well-known generating polynomial");
|
||||
PrintAndLogEx(NORMAL, "[- ]with 16 effective bits only, but shows unexpected behavior, try again.");
|
||||
}
|
||||
return 2;
|
||||
}
|
||||
case 2 :
|
||||
PrintAndLogEx(SUCCESS, _GREEN_(always leak NACK detected));
|
||||
return 3;
|
||||
case 1 :
|
||||
PrintAndLogEx(SUCCESS, _GREEN_(NACK bug detected));
|
||||
return 1;
|
||||
case 0 :
|
||||
PrintAndLogEx(SUCCESS, "No NACK bug detected");
|
||||
return 2;
|
||||
default :
|
||||
PrintAndLogEx(WARNING, "errorcode from device [%i]", ok);
|
||||
return 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
@ -996,7 +1035,8 @@ int detect_classic_nackbug(bool verbose){
|
|||
return 0;
|
||||
}
|
||||
/* try to see if card responses to "chinese magic backdoor" commands. */
|
||||
void detect_classic_magic(void) {
|
||||
void detect_classic_magic(void)
|
||||
{
|
||||
|
||||
uint8_t isGeneration = 0;
|
||||
UsbCommand resp;
|
||||
|
@ -1006,10 +1046,16 @@ void detect_classic_magic(void) {
|
|||
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
|
||||
isGeneration = resp.arg[0] & 0xff;
|
||||
|
||||
switch( isGeneration ){
|
||||
case 1: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): " _GREEN_(YES)); break;
|
||||
case 2: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): " _GREEN_(YES)); break;
|
||||
switch (isGeneration) {
|
||||
case 1:
|
||||
PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): " _GREEN_(YES));
|
||||
break;
|
||||
case 2:
|
||||
PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): " _GREEN_(YES));
|
||||
break;
|
||||
//case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): " _GREEN_(YES)); break;
|
||||
default: PrintAndLogEx(INFO, "Answers to magic commands: " _YELLOW_(NO)); break;
|
||||
default:
|
||||
PrintAndLogEx(INFO, "Answers to magic commands: " _YELLOW_(NO));
|
||||
break;
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue