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

hf iclass replay

Browse source
This commit is contained in:
iceman1001 2020-08-12 13:00:30 +02:00
commit f13fbe32e8
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
armsrc/appmain.c
View file

@ -502,6 +502,7 @@ static void SendCapabilities(void) {
// Show some leds in a pattern to identify StandAlone mod is running // Show some leds in a pattern to identify StandAlone mod is running
void StandAloneMode(void) { void StandAloneMode(void) {
DbpString("");
DbpString("Stand-alone mode, no computer necessary"); DbpString("Stand-alone mode, no computer necessary");
SpinDown(50); SpinDown(50);
SpinDelay(50); SpinDelay(50);
@ -780,7 +781,7 @@ static void PacketReceived(PacketCommandNG *packet) {
case CMD_LF_HID_WATCH: { case CMD_LF_HID_WATCH: {
uint32_t high, low; uint32_t high, low;
int res = lf_hid_watch(0, &high, &low); int res = lf_hid_watch(0, &high, &low);
reply_ng(CMD_LF_HID_WATCH, res, NULL, 0); reply_ng(CMD_LF_HID_WATCH, res, NULL, 0);
break; break;
} }
case CMD_LF_HID_SIMULATE: { case CMD_LF_HID_SIMULATE: {
@ -1023,12 +1024,16 @@ static void PacketReceived(PacketCommandNG *packet) {
break; break;
} }
case CMD_HF_ISO15693_SNIFF: { case CMD_HF_ISO15693_SNIFF: {
/*
struct p { struct p {
uint8_t jam_search_len; uint8_t jam_search_len;
uint8_t jam_search_string[]; uint8_t jam_search_string[];
} PACKED; } PACKED;
struct p *payload = (struct p *) packet->data.asBytes; struct p *payload = (struct p *) packet->data.asBytes;
SniffIso15693(payload->jam_search_len, payload->jam_search_string); SniffIso15693(payload->jam_search_len, payload->jam_search_string);
*/
SniffIso15693(0, NULL);
reply_ng(CMD_HF_ISO15693_SNIFF, PM3_SUCCESS, NULL, 0); reply_ng(CMD_HF_ISO15693_SNIFF, PM3_SUCCESS, NULL, 0);
break; break;
} }
@ -1399,10 +1404,10 @@ static void PacketReceived(PacketCommandNG *packet) {
} }
case CMD_HF_ICLASS_REPLAY: { case CMD_HF_ICLASS_REPLAY: {
struct p { struct p {
uint8_t reader; uint8_t reader[4];
uint8_t mac[4]; uint8_t mac[4];
} PACKED; } PACKED;
struct p *payload = (struct p *) packet->data.asBytes; struct p *payload = (struct p *) packet->data.asBytes;
ReaderIClass_Replay(payload->reader, payload->mac); ReaderIClass_Replay(payload->reader, payload->mac);
break; break;
} }

5
armsrc/iclass.c
View file

@ -1469,12 +1469,13 @@ void ReaderIClass(uint8_t flags) {
} }
// turn off afterwards // turn off afterwards
void ReaderIClass_Replay(uint8_t reader, uint8_t *mac) { void ReaderIClass_Replay(uint8_t *rnr, uint8_t *mac) {
BigBuf_free(); BigBuf_free();
uint8_t check[] = { ICLASS_CMD_CHECK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; uint8_t check[] = { ICLASS_CMD_CHECK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
// copy mac
memcpy(check + 1, rnr, 4);
memcpy(check + 5, mac, 4); memcpy(check + 5, mac, 4);
uint8_t *card_data = BigBuf_malloc(ICLASS_16KS_SIZE); uint8_t *card_data = BigBuf_malloc(ICLASS_16KS_SIZE);

2
armsrc/iclass.h
View file

@ -17,7 +17,7 @@
void SniffIClass(uint8_t jam_search_len, uint8_t *jam_search_string); void SniffIClass(uint8_t jam_search_len, uint8_t *jam_search_string);
void ReaderIClass(uint8_t arg0); void ReaderIClass(uint8_t arg0);
void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac); void ReaderIClass_Replay(uint8_t *rnr, uint8_t *mac);
void iClass_WriteBlock(uint8_t *msg); void iClass_WriteBlock(uint8_t *msg);
void iClass_Dump(uint8_t *msg); void iClass_Dump(uint8_t *msg);