chg: cident - uses NG

This commit is contained in:
iceman1001 2019-05-15 07:03:19 -04:00
parent 65ff4f0e92
commit 50c59fb6b2
2 changed files with 8 additions and 3 deletions

View file

@ -1945,6 +1945,7 @@ void MifareCIdent() {
uint8_t *buf = BigBuf_malloc(PM3_CMD_DATA_SIZE);
uint8_t *uid = BigBuf_malloc(10);
uint32_t cuid = 0;
uint8_t data[1] = {0x00};
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
@ -1982,7 +1983,9 @@ TEST2:
};
OUT:
reply_old(CMD_ACK, isGen, 0, 0, 0, 0);
data[0] = isGen;
reply_ng(CMD_MIFARE_CIDENT, PM3_SUCCESS, data, sizeof(data));
// turns off
OnSuccessMagic();
BigBuf_free();

View file

@ -974,8 +974,10 @@ void detect_classic_magic(void) {
PacketResponseNG resp;
clearCommandBuffer();
SendCommandNG(CMD_MIFARE_CIDENT, NULL, 0);
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
isGeneration = resp.oldarg[0] & 0xff;
if (WaitForResponseTimeout(CMD_MIFARE_CIDENT, &resp, 1500)) {
if ( resp.status == PM3_SUCCESS )
isGeneration = resp.data.asBytes[0];
}
switch (isGeneration) {
case 1: