dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Gen3 detection bug against MFUL

Browse Source
This commit is contained in:
Philippe Teuwen
2020-09-23 12:25:30 +02:00
parent f6d7890802
commit 7d4c6e8faa
6 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/mifare/mifarehost.c
View File

@@ -1154,13 +1154,14 @@ int detect_classic_static_nonce(void) {
return NONCE_FAIL;
}
/* try to see if card responses to "chinese magic backdoor" commands. */
int detect_classic_magic(void) {
/* try to see if card responses to "Chinese magic backdoor" commands. */
int detect_mf_magic(bool is_mfc) {
uint8_t isGeneration = 0;
PacketResponseNG resp;
clearCommandBuffer();
SendCommandNG(CMD_HF_MIFARE_CIDENT, NULL, 0);
uint8_t payload[] = { is_mfc };
SendCommandNG(CMD_HF_MIFARE_CIDENT, payload, sizeof(payload));
if (WaitForResponseTimeout(CMD_HF_MIFARE_CIDENT, &resp, 1500)) {
if (resp.status == PM3_SUCCESS)
isGeneration = resp.data.asBytes[0];

2
client/src/mifare/mifarehost.h
View File

@@ -88,7 +88,7 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data,
int detect_classic_prng(void);
int detect_classic_nackbug(bool verbose);
int detect_classic_magic(void);
int detect_mf_magic(bool is_mfc);
int detect_classic_static_nonce(void);
void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted);
#endif