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 4

style

Browse source
This commit is contained in:
iceman1001 2025-06-11 21:40:54 +02:00
commit 92c288ab85
3 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
armsrc/iso14443a.c
View file

@ -1768,7 +1768,7 @@ void SimulateIso14443aTag(uint8_t tagType, uint16_t flags, uint8_t *useruid, uin
numReads++; // Increment number of times reader requested a block numReads++; // Increment number of times reader requested a block
if (exitAfterNReads > 0 && numReads == exitAfterNReads) { if (exitAfterNReads > 0 && numReads == exitAfterNReads) {
Dbprintf("[MFUEMUL_WORK] %d reads done, exiting", numReads); Dbprintf("[MFUEMUL_WORK] " _YELLOW_("%u") " reads done, exiting", numReads);
finished = true; finished = true;
} }
} }
@ -2441,7 +2441,7 @@ int EmSendCmd14443aRaw(const uint8_t *resp, uint16_t respLen) {
int EmSend4bit(uint8_t resp) { int EmSend4bit(uint8_t resp) {
Code4bitAnswerAsTag(resp); Code4bitAnswerAsTag(resp);
tosend_t *ts = get_tosend(); const tosend_t *ts = get_tosend();
int res = EmSendCmd14443aRaw(ts->buf, ts->max); int res = EmSendCmd14443aRaw(ts->buf, ts->max);
// do the tracing for the previous reader request and this tag answer: // do the tracing for the previous reader request and this tag answer:
uint8_t par[1] = {0x00}; uint8_t par[1] = {0x00};
@ -2463,7 +2463,7 @@ int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par) {
} }
int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision) { int EmSendCmdParEx(uint8_t *resp, uint16_t respLen, uint8_t *par, bool collision) {
CodeIso14443aAsTagPar(resp, respLen, par, collision); CodeIso14443aAsTagPar(resp, respLen, par, collision);
tosend_t *ts = get_tosend(); const tosend_t *ts = get_tosend();
int res = EmSendCmd14443aRaw(ts->buf, ts->max); int res = EmSendCmd14443aRaw(ts->buf, ts->max);
// do the tracing for the previous reader request and this tag answer: // do the tracing for the previous reader request and this tag answer:
@ -2633,7 +2633,7 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint16_t rec_max
void ReaderTransmitBitsPar(const uint8_t *frame, uint16_t bits, uint8_t *par, uint32_t *timing) { void ReaderTransmitBitsPar(const uint8_t *frame, uint16_t bits, uint8_t *par, uint32_t *timing) {
CodeIso14443aBitsAsReaderPar(frame, bits, par); CodeIso14443aBitsAsReaderPar(frame, bits, par);
// Send command to tag // Send command to tag
tosend_t *ts = get_tosend(); const tosend_t *ts = get_tosend();
TransmitFor14443a(ts->buf, ts->max, timing); TransmitFor14443a(ts->buf, ts->max, timing);
if (g_trigger) LED_A_ON(); if (g_trigger) LED_A_ON();
@ -2801,7 +2801,7 @@ static int GetATQA(uint8_t *resp, uint16_t resp_len, uint8_t *resp_par, const is
// Use the temporary polling parameters // Use the temporary polling parameters
do { do {
iso14a_polling_frame_t *frp = &p.frames[curr]; const iso14a_polling_frame_t *frp = &p.frames[curr];
if (frp->last_byte_bits == 8) { if (frp->last_byte_bits == 8) {
ReaderTransmit(frp->frame, frp->frame_length, NULL); ReaderTransmit(frp->frame, frp->frame_length, NULL);
@ -4211,8 +4211,9 @@ void SimulateIso14443aTagAID(uint8_t tagType, uint16_t flags, uint8_t *uid,
uint8_t offset = 0; uint8_t offset = 0;
switch (receivedCmd[0]) { switch (receivedCmd[0]) {
case 0x0B: // IBlock with CID case 0x0B: // IBlock with CID
case 0x0A: case 0x0A: {
offset = 1; offset = 1;
}
case 0x02: // IBlock without CID case 0x02: // IBlock without CID
case 0x03: { case 0x03: {
dynamic_response_info.response[0] = receivedCmd[0]; dynamic_response_info.response[0] = receivedCmd[0];

2
armsrc/mifaresim.c
View file

@ -1052,7 +1052,7 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *uid, uint16_t
numReads++; numReads++;
if (exitAfterNReads > 0 && numReads == exitAfterNReads) { if (exitAfterNReads > 0 && numReads == exitAfterNReads) {
Dbprintf("[MFEMUL_WORK] %d reads done, exiting", numReads); Dbprintf("[MFEMUL_WORK] " _YELLOW_("%u") " reads done, exiting", numReads);
finished = true; finished = true;
} }
break; break;

6
armsrc/mifareutil.c
View file

@ -440,21 +440,17 @@ int mifare_ultra_aes_auth(uint8_t keyno, uint8_t *keybytes) {
uint8_t key[16] = { 0 }; uint8_t key[16] = { 0 };
memcpy(key, keybytes, sizeof(key)); memcpy(key, keybytes, sizeof(key));
uint16_t len = 0;
// 1 cmd + 16 bytes + 2 crc // 1 cmd + 16 bytes + 2 crc
uint8_t resp[19] = {0x00}; uint8_t resp[19] = {0x00};
uint8_t respPar[5] = {0}; uint8_t respPar[5] = {0};
// setup AES // setup AES
mbedtls_aes_context actx; mbedtls_aes_context actx;
mbedtls_aes_init(&actx); mbedtls_aes_init(&actx);
mbedtls_aes_init(&actx);
mbedtls_aes_setkey_dec(&actx, key, 128); mbedtls_aes_setkey_dec(&actx, key, 128);
// Send REQUEST AUTHENTICATION / receive tag nonce // Send REQUEST AUTHENTICATION / receive tag nonce
len = mifare_sendcmd_short(NULL, CRYPT_NONE, MIFARE_ULAES_AUTH_1, keyno, resp, sizeof(resp), respPar, NULL); uint16_t len = mifare_sendcmd_short(NULL, CRYPT_NONE, MIFARE_ULAES_AUTH_1, keyno, resp, sizeof(resp), respPar, NULL);
if (len != 19) { if (len != 19) {
if (g_dbglevel >= DBG_ERROR) Dbprintf("Cmd Error: %02x - expected 19 got " _RED_("%u"), resp[0], len); if (g_dbglevel >= DBG_ERROR) Dbprintf("Cmd Error: %02x - expected 19 got " _RED_("%u"), resp[0], len);
return 0; return 0;