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

Make style

Browse source
This commit is contained in:
Bjoern Kerler 2020-04-10 22:59:55 +02:00
commit 70b000bc79
2 changed files with 142 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

40
armsrc/mifaredesfire.c
View file

@ -268,18 +268,13 @@ void MifareDES_Auth1(uint8_t *datain) {
LED_B_OFF(); LED_B_OFF();
LED_C_OFF(); LED_C_OFF();
if (payload->key==NULL) if (payload->key == NULL) {
{ if (payload->mode == MFDES_AUTH_DES || payload->mode == MFDES_AUTH_PICC) {
if (payload->mode==MFDES_AUTH_DES || payload->mode==MFDES_AUTH_PICC)
{
memcpy(keybytes, PICC_MASTER_KEY8, 8); memcpy(keybytes, PICC_MASTER_KEY8, 8);
} } else if (payload->mode == MFDES_AUTH_AES) {
else if (payload->mode==MFDES_AUTH_AES)
{
memcpy(keybytes, PICC_MASTER_KEY16, 16); memcpy(keybytes, PICC_MASTER_KEY16, 16);
} }
} } else {
else {
memcpy(keybytes, payload->key, payload->keylen); memcpy(keybytes, payload->key, payload->keylen);
} }
@ -289,16 +284,13 @@ void MifareDES_Auth1(uint8_t *datain) {
if (payload->algo == MFDES_ALGO_AES) { if (payload->algo == MFDES_ALGO_AES) {
mbedtls_aes_init(&ctx); mbedtls_aes_init(&ctx);
Desfire_aes_key_new(keybytes, key); Desfire_aes_key_new(keybytes, key);
} } else if (payload->algo == MFDES_ALGO_3DES) {
else if (payload->algo == MFDES_ALGO_3DES) {
key->type = T_3DES; key->type = T_3DES;
Desfire_3des_key_new_with_version(keybytes, key); Desfire_3des_key_new_with_version(keybytes, key);
} } else if (payload->algo == MFDES_ALGO_DES) {
else if (payload->algo == MFDES_ALGO_DES) {
key->type = T_DES; key->type = T_DES;
Desfire_des_key_new(keybytes, key); Desfire_des_key_new(keybytes, key);
} } else if (payload->algo == MFDES_ALGO_3K3DES) {
else if (payload->algo == MFDES_ALGO_3K3DES) {
Desfire_3k3des_key_new_with_version(keybytes, key); Desfire_3k3des_key_new_with_version(keybytes, key);
} }
@ -319,8 +311,7 @@ void MifareDES_Auth1(uint8_t *datain) {
cmd[5] = payload->keyno; cmd[5] = payload->keyno;
cmd[6] = 0x0; cmd[6] = 0x0;
len = DesfireAPDU(cmd, 7, resp); len = DesfireAPDU(cmd, 7, resp);
} } else {
else {
cmd[0] = AUTHENTICATE; cmd[0] = AUTHENTICATE;
cmd[1] = payload->keyno; cmd[1] = payload->keyno;
len = DesfireAPDU(cmd, 2, resp); len = DesfireAPDU(cmd, 2, resp);
@ -357,8 +348,7 @@ void MifareDES_Auth1(uint8_t *datain) {
return; return;
} }
mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_DECRYPT, 16, IV, encRndB, RndB); mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_DECRYPT, 16, IV, encRndB, RndB);
} } else if (payload->algo == MFDES_ALGO_3DES)
else if (payload->algo == MFDES_ALGO_3DES)
tdes_dec(&RndB, &encRndB, key->data); tdes_dec(&RndB, &encRndB, key->data);
else if (payload->algo == MFDES_ALGO_DES) else if (payload->algo == MFDES_ALGO_DES)
des_dec(&RndB, &encRndB, key->data); des_dec(&RndB, &encRndB, key->data);
@ -388,8 +378,7 @@ void MifareDES_Auth1(uint8_t *datain) {
des_dec(&encRndB, &rotRndB, key->data); des_dec(&encRndB, &rotRndB, key->data);
memcpy(both + 8, encRndB, 8); memcpy(both + 8, encRndB, 8);
} } else if (payload->mode == MFDES_AUTH_AES || payload->mode == MFDES_AUTH_ISO) {
else if (payload->mode==MFDES_AUTH_AES || payload->mode==MFDES_AUTH_ISO) {
uint8_t tmp[32] = {0x00}; uint8_t tmp[32] = {0x00};
memcpy(tmp, RndA, 16); memcpy(tmp, RndA, 16);
memcpy(tmp + 16, rotRndB, 16); memcpy(tmp + 16, rotRndB, 16);
@ -434,8 +423,7 @@ void MifareDES_Auth1(uint8_t *datain) {
OnErrorNG(CMD_HF_DESFIRE_AUTH1, 6); OnErrorNG(CMD_HF_DESFIRE_AUTH1, 6);
return; return;
} }
} } else {
else {
if (resp[1] != 0x00) { if (resp[1] != 0x00) {
DbpString("Authentication failed."); DbpString("Authentication failed.");
OnErrorNG(CMD_HF_DESFIRE_AUTH1, 6); OnErrorNG(CMD_HF_DESFIRE_AUTH1, 6);
@ -452,8 +440,7 @@ void MifareDES_Auth1(uint8_t *datain) {
if (payload->mode != MFDES_AUTH_PICC) { if (payload->mode != MFDES_AUTH_PICC) {
memcpy(encRndA, resp + 1, payload->keylen); memcpy(encRndA, resp + 1, payload->keylen);
} } else {
else {
memcpy(encRndA, resp + 2, payload->keylen); memcpy(encRndA, resp + 2, payload->keylen);
} }
@ -462,8 +449,7 @@ void MifareDES_Auth1(uint8_t *datain) {
tdes_dec(&encRndA, &encRndA, key->data); tdes_dec(&encRndA, &encRndA, key->data);
else if (payload->algo == MFDES_ALGO_DES) else if (payload->algo == MFDES_ALGO_DES)
des_dec(&encRndA, &encRndA, key->data); des_dec(&encRndA, &encRndA, key->data);
} } 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) {
DbpString("mbedtls_aes_setkey_dec failed"); DbpString("mbedtls_aes_setkey_dec failed");