RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-04-02 10:30:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

style

Browse source
This commit is contained in:
iceman1001 2019-04-17 14:54:42 +02:00
parent da2aa2c55f
commit 1ee3679a98
6 changed files with 45 additions and 55 deletions

30
armsrc/mifaresim.c
View file

@ -197,8 +197,7 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
// If uid size defined, copy only uid from EMUL to use, backward compatibility for 'hf_colin.c', 'hf_mattyrun.c' // If uid size defined, copy only uid from EMUL to use, backward compatibility for 'hf_colin.c', 'hf_mattyrun.c'
if ((flags & (FLAG_4B_UID_IN_DATA | FLAG_7B_UID_IN_DATA | FLAG_10B_UID_IN_DATA)) != 0) { if ((flags & (FLAG_4B_UID_IN_DATA | FLAG_7B_UID_IN_DATA | FLAG_10B_UID_IN_DATA)) != 0) {
memcpy(datain, block0, 10); // load 10bytes from EMUL to the datain pointer. to be used below. memcpy(datain, block0, 10); // load 10bytes from EMUL to the datain pointer. to be used below.
} } else {
else {
// Check for 4 bytes uid: bcc corrected and single size uid bits in ATQA // Check for 4 bytes uid: bcc corrected and single size uid bits in ATQA
if ((block0[0] ^ block0[1] ^ block0[2] ^ block0[3]) == block0[4] && (block0[6] & 0xc0) == 0) { if ((block0[0] ^ block0[1] ^ block0[2] ^ block0[3]) == block0[4] && (block0[6] & 0xc0) == 0) {
flags |= FLAG_4B_UID_IN_DATA; flags |= FLAG_4B_UID_IN_DATA;
@ -212,8 +211,7 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
memcpy(datain, block0, 7); memcpy(datain, block0, 7);
rSAK[0] = block0[7]; rSAK[0] = block0[7];
memcpy(rATQA, &block0[8], sizeof(rATQA)); memcpy(rATQA, &block0[8], sizeof(rATQA));
} } else {
else {
Dbprintf("[-] ERROR: Invalid dump. UID/SAK/ATQA not found"); Dbprintf("[-] ERROR: Invalid dump. UID/SAK/ATQA not found");
return false; return false;
} }
@ -227,20 +225,17 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
memcpy(rATQA, rATQA_Mini, sizeof(rATQA)); memcpy(rATQA, rATQA_Mini, sizeof(rATQA));
rSAK[0] = rSAK_Mini; rSAK[0] = rSAK_Mini;
Dbprintf("Mifare Mini"); Dbprintf("Mifare Mini");
} } else if ((flags & FLAG_MF_1K) == FLAG_MF_1K) {
else if ((flags & FLAG_MF_1K) == FLAG_MF_1K) {
memcpy(rATQA, rATQA_1k, sizeof(rATQA)); memcpy(rATQA, rATQA_1k, sizeof(rATQA));
rSAK[0] = rSAK_1k; rSAK[0] = rSAK_1k;
Dbprintf("Mifare 1K"); Dbprintf("Mifare 1K");
} } else if ((flags & FLAG_MF_2K) == FLAG_MF_2K) {
else if ((flags & FLAG_MF_2K) == FLAG_MF_2K) {
memcpy(rATQA, rATQA_2k, sizeof(rATQA)); memcpy(rATQA, rATQA_2k, sizeof(rATQA));
rSAK[0] = rSAK_2k; rSAK[0] = rSAK_2k;
*rats = rRATS; *rats = rRATS;
*rats_len = sizeof(rRATS); *rats_len = sizeof(rRATS);
Dbprintf("Mifare 2K with RATS support"); Dbprintf("Mifare 2K with RATS support");
} } else if ((flags & FLAG_MF_4K) == FLAG_MF_4K) {
else if ((flags & FLAG_MF_4K) == FLAG_MF_4K) {
memcpy(rATQA, rATQA_4k, sizeof(rATQA)); memcpy(rATQA, rATQA_4k, sizeof(rATQA));
rSAK[0] = rSAK_4k; rSAK[0] = rSAK_4k;
Dbprintf("Mifare 4K"); Dbprintf("Mifare 4K");
@ -312,8 +307,7 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t *
// Correct uid size bits in ATQA // Correct uid size bits in ATQA
rATQA[0] = (rATQA[0] & 0x3f) | 0x80; // triple size uid rATQA[0] = (rATQA[0] & 0x3f) | 0x80; // triple size uid
} } else {
else {
Dbprintf("[-] ERROR: UID size not defined"); Dbprintf("[-] ERROR: UID size not defined");
return false; return false;
} }
@ -948,12 +942,10 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
memcpy(response, rats, rats_len); memcpy(response, rats, rats_len);
mf_crypto1_encrypt(pcs, response, rats_len, response_par); mf_crypto1_encrypt(pcs, response, rats_len, response_par);
EmSendCmdPar(response, rats_len, response_par); EmSendCmdPar(response, rats_len, response_par);
} } else
else
EmSendCmd(rats, rats_len); EmSendCmd(rats, rats_len);
if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RCV RATS => ACK"); if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RCV RATS => ACK");
} } else {
else {
EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA); EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RCV RATS => NACK"); if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RCV RATS => NACK");
} }
@ -968,12 +960,10 @@ void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t
memcpy(response, receivedCmd_dec, receivedCmd_len); memcpy(response, receivedCmd_dec, receivedCmd_len);
mf_crypto1_encrypt(pcs, response, receivedCmd_len, response_par); mf_crypto1_encrypt(pcs, response, receivedCmd_len, response_par);
EmSendCmdPar(response, receivedCmd_len, response_par); EmSendCmdPar(response, receivedCmd_len, response_par);
} } else
else
EmSendCmd(receivedCmd_dec, receivedCmd_len); EmSendCmd(receivedCmd_dec, receivedCmd_len);
if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RCV NXP DESELECT => ACK"); if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RCV NXP DESELECT => ACK");
} } else {
else {
EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA); EmSend4bit(encrypted_data ? mf_crypto1_encrypt4bit(pcs, CARD_NACK_NA) : CARD_NACK_NA);
if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RCV NXP DESELECT => NACK"); if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("[MFEMUL_WORK] RCV NXP DESELECT => NACK");
} }

4
client/comms.c
View file

@ -59,7 +59,7 @@ void SendCommand(UsbCommand *c) {
#endif #endif
if (offline) { if (offline) {
PrintAndLogEx(WARNING, "Sending bytes to Proxmark3 failed." _YELLOW_("offline") ); PrintAndLogEx(WARNING, "Sending bytes to Proxmark3 failed." _YELLOW_("offline"));
return; return;
} }
@ -275,7 +275,7 @@ __attribute__((force_align_arg_pointer))
if (txBuffer_pending) { if (txBuffer_pending) {
if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(UsbCommand))) { if (!uart_send(sp, (uint8_t *) &txBuffer, sizeof(UsbCommand))) {
//counter_to_offline++; //counter_to_offline++;
PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device" _RED_("failed") ); PrintAndLogEx(WARNING, "sending bytes to Proxmark3 device" _RED_("failed"));
} }
txBuffer_pending = false; txBuffer_pending = false;

2
client/emv/cmdemv.c
View file

@ -287,7 +287,7 @@ static int CmdEMVGPO(const char *Cmd) {
PrintAndLogEx(ERR, "Can't create PDOL data."); PrintAndLogEx(ERR, "Can't create PDOL data.");
tlvdb_free(tmp_ext); tlvdb_free(tmp_ext);
tlvdb_free(tlvRoot); tlvdb_free(tlvRoot);
if ( pdol_data_tlv != &data_tlv); if (pdol_data_tlv != &data_tlv);
free(pdol_data_tlv); free(pdol_data_tlv);
return 4; return 4;
} }

4
client/emv/crypto_polarssl.c
View file

@ -261,7 +261,7 @@ static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_
result = malloc(*plen); result = malloc(*plen);
memset(result, 0x00, *plen); memset(result, 0x00, *plen);
res = mbedtls_mpi_write_binary(&cp->ctx.N, result, *plen); res = mbedtls_mpi_write_binary(&cp->ctx.N, result, *plen);
if ( res == 0 ) { if (res == 0) {
printf("Error write_binary."); printf("Error write_binary.");
result = 0; result = 0;
} }
@ -272,7 +272,7 @@ static unsigned char *crypto_pk_polarssl_get_parameter(const struct crypto_pk *_
result = malloc(*plen); result = malloc(*plen);
memset(result, 0x00, *plen); memset(result, 0x00, *plen);
res = mbedtls_mpi_write_binary(&cp->ctx.E, result, *plen); res = mbedtls_mpi_write_binary(&cp->ctx.E, result, *plen);
if ( res == 0 ) { if (res == 0) {
printf("Error write_binary."); printf("Error write_binary.");
result = 0; result = 0;
} }

2
client/tinycbor/open_memstream.c
View file

@ -67,7 +67,7 @@ static RetType write_to_buffer(void *cookie, const char *data, LenType len) {
size_t newalloc = newsize + newsize / 2 + 1; // give 50% more room size_t newalloc = newsize + newsize / 2 + 1; // give 50% more room
char *tmp = realloc(ptr, newalloc); char *tmp = realloc(ptr, newalloc);
if ( tmp == NULL ) { if (tmp == NULL) {
free(ptr); free(ptr);
return -1; return -1;
} else { } else {