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

Make style

Browse source
This commit is contained in:
Bjoern Kerler 2020-04-12 17:41:36 +02:00
commit 44e9d13d1a
3 changed files with 263 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

12
armsrc/desfire_crypto.c
View file

@ -482,8 +482,8 @@ void tdes_nxp_receive(const void *in, void *out, size_t length, const void *key,
while (length > 0) { while (length > 0) {
memcpy(temp, tin, 8); memcpy(temp, tin, 8);
if (keymode==2) tdes_2key_dec(tout,tin,key); if (keymode == 2) tdes_2key_dec(tout, tin, key);
else if (keymode==3) tdes_3key_dec(tout,tin,key); else if (keymode == 3) tdes_3key_dec(tout, tin, key);
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
tout[i] = (unsigned char)(tout[i] ^ iv[i]); tout[i] = (unsigned char)(tout[i] ^ iv[i]);
@ -508,8 +508,8 @@ void tdes_nxp_send(const void *in, void *out, size_t length, const void *key, un
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
tin[i] = (unsigned char)(tin[i] ^ iv[i]); tin[i] = (unsigned char)(tin[i] ^ iv[i]);
if (keymode==2) tdes_2key_enc(tout,tin,key); if (keymode == 2) tdes_2key_enc(tout, tin, key);
else if (keymode==3) tdes_3key_enc(tout,tin,key); else if (keymode == 3) tdes_3key_enc(tout, tin, key);
memcpy(iv, tout, 8); memcpy(iv, tout, 8);
@ -1061,7 +1061,7 @@ void *mifare_cryto_postprocess_data(desfiretag_t tag, void *data, size_t *nbytes
do { do {
uint16_t crc_16 = 0x00; uint16_t crc_16 = 0x00;
uint32_t crc=0x00; uint32_t crc = 0x00;
switch (DESFIRE(tag)->authentication_scheme) { switch (DESFIRE(tag)->authentication_scheme) {
case AS_LEGACY: case AS_LEGACY:
AddCrc14A((uint8_t *)res, end_crc_pos); AddCrc14A((uint8_t *)res, end_crc_pos);
@ -1120,7 +1120,7 @@ void *mifare_cryto_postprocess_data(desfiretag_t tag, void *data, size_t *nbytes
break; break;
default: default:
PrintAndLogEx(ERR,"Unknown communication settings"); PrintAndLogEx(ERR, "Unknown communication settings");
*nbytes = -1; *nbytes = -1;
res = NULL; res = NULL;
break; break;

17
armsrc/mifaredesfire.c
View file

@ -253,9 +253,11 @@ void MifareDES_Auth1(uint8_t *datain) {
// Default Keys // Default Keys
uint8_t PICC_MASTER_KEY8[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; uint8_t PICC_MASTER_KEY8[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
uint8_t PICC_MASTER_KEY16[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, uint8_t PICC_MASTER_KEY16[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00}; 0x00, 0x00
};
uint8_t PICC_MASTER_KEY24[24] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, uint8_t PICC_MASTER_KEY24[24] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
//uint8_t null_key_data16[16] = {0x00}; //uint8_t null_key_data16[16] = {0x00};
//uint8_t new_key_data8[8] = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77}; //uint8_t new_key_data8[8] = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77};
//uint8_t new_key_data16[16] = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF}; //uint8_t new_key_data16[16] = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF};
@ -389,18 +391,17 @@ void MifareDES_Auth1(uint8_t *datain) {
des_dec(encRndB, rotRndB, key->data); des_dec(encRndB, rotRndB, key->data);
memcpy(both + 8, encRndB, rndlen); memcpy(both + 8, encRndB, rndlen);
} } else if (payload->mode == MFDES_AUTH_ISO) {
else if (payload->mode == MFDES_AUTH_ISO) {
if (payload->algo == MFDES_ALGO_3DES) { if (payload->algo == MFDES_ALGO_3DES) {
uint8_t tmp[16] = {0x00}; uint8_t tmp[16] = {0x00};
memcpy(tmp, RndA, rndlen); memcpy(tmp, RndA, rndlen);
memcpy(tmp + rndlen, rotRndB, rndlen); memcpy(tmp + rndlen, rotRndB, rndlen);
tdes_nxp_send(tmp, both, 16, key->data, IV,2); tdes_nxp_send(tmp, both, 16, key->data, IV, 2);
} else if (payload->algo == MFDES_ALGO_3K3DES) { } else if (payload->algo == MFDES_ALGO_3K3DES) {
uint8_t tmp[32] = {0x00}; uint8_t tmp[32] = {0x00};
memcpy(tmp, RndA, rndlen); memcpy(tmp, RndA, rndlen);
memcpy(tmp + rndlen, rotRndB, rndlen); memcpy(tmp + rndlen, rotRndB, rndlen);
tdes_nxp_send(tmp, both, 32, key->data, IV,3); tdes_nxp_send(tmp, both, 32, key->data, IV, 3);
} }
} else if (payload->mode == MFDES_AUTH_AES) { } else if (payload->mode == MFDES_AUTH_AES) {
uint8_t tmp[32] = {0x00}; uint8_t tmp[32] = {0x00};
@ -476,9 +477,9 @@ void MifareDES_Auth1(uint8_t *datain) {
if (payload->algo == MFDES_ALGO_DES) if (payload->algo == MFDES_ALGO_DES)
des_dec(encRndA, encRndA, key->data); des_dec(encRndA, encRndA, key->data);
else if (payload->algo == MFDES_ALGO_3DES) else if (payload->algo == MFDES_ALGO_3DES)
tdes_nxp_receive(encRndA, encRndA, rndlen, key->data, IV,2); tdes_nxp_receive(encRndA, encRndA, rndlen, key->data, IV, 2);
else if (payload->algo == MFDES_ALGO_3K3DES) else if (payload->algo == MFDES_ALGO_3K3DES)
tdes_nxp_receive(encRndA, encRndA, rndlen, key->data, IV,3); tdes_nxp_receive(encRndA, encRndA, rndlen, key->data, IV, 3);
} else if (payload->mode == MFDES_AUTH_AES) { } else if (payload->mode == MFDES_AUTH_AES) {
if (mbedtls_aes_setkey_dec(&ctx, key->data, 128) != 0) { if (mbedtls_aes_setkey_dec(&ctx, key->data, 128) != 0) {
if (DBGLEVEL >= DBG_EXTENDED) { if (DBGLEVEL >= DBG_EXTENDED) {

12
client/mifare/desfire_crypto.c
View file

@ -482,8 +482,8 @@ void tdes_nxp_receive(const void *in, void *out, size_t length, const void *key,
while (length > 0) { while (length > 0) {
memcpy(temp, tin, 8); memcpy(temp, tin, 8);
if (keymode==2) tdes_2key_dec(tout,tin,key); if (keymode == 2) tdes_2key_dec(tout, tin, key);
else if (keymode==3) tdes_3key_dec(tout,tin,key); else if (keymode == 3) tdes_3key_dec(tout, tin, key);
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
tout[i] = (unsigned char)(tout[i] ^ iv[i]); tout[i] = (unsigned char)(tout[i] ^ iv[i]);
@ -508,8 +508,8 @@ void tdes_nxp_send(const void *in, void *out, size_t length, const void *key, un
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
tin[i] = (unsigned char)(tin[i] ^ iv[i]); tin[i] = (unsigned char)(tin[i] ^ iv[i]);
if (keymode==2) tdes_2key_enc(tout,tin,key); if (keymode == 2) tdes_2key_enc(tout, tin, key);
else if (keymode==3) tdes_3key_enc(tout,tin,key); else if (keymode == 3) tdes_3key_enc(tout, tin, key);
memcpy(iv, tout, 8); memcpy(iv, tout, 8);
@ -1061,7 +1061,7 @@ void *mifare_cryto_postprocess_data(desfiretag_t tag, void *data, size_t *nbytes
do { do {
uint16_t crc_16 = 0x00; uint16_t crc_16 = 0x00;
uint32_t crc=0x00; uint32_t crc = 0x00;
switch (DESFIRE(tag)->authentication_scheme) { switch (DESFIRE(tag)->authentication_scheme) {
case AS_LEGACY: case AS_LEGACY:
AddCrc14A((uint8_t *)res, end_crc_pos); AddCrc14A((uint8_t *)res, end_crc_pos);
@ -1120,7 +1120,7 @@ void *mifare_cryto_postprocess_data(desfiretag_t tag, void *data, size_t *nbytes
break; break;
default: default:
PrintAndLogEx(ERR,"Unknown communication settings"); PrintAndLogEx(ERR, "Unknown communication settings");
*nbytes = -1; *nbytes = -1;
res = NULL; res = NULL;
break; break;