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

92
armsrc/mifaredesfire.c
View file

@ -98,8 +98,8 @@ void MifareSendCommand(uint8_t *datain) {
} PACKED;
struct r rpayload;
rpayload.len=len;
memcpy(rpayload.data,resp,rpayload.len);
rpayload.len = len;
memcpy(rpayload.data, resp, rpayload.len);
reply_ng(CMD_HF_DESFIRE_COMMAND, PM3_SUCCESS, (uint8_t *)&rpayload, sizeof(payload));
LED_B_OFF();
}
@ -254,7 +254,7 @@ void MifareDES_Auth1(uint8_t *datain) {
num_to_bytes(value, 4, &RndA[12]);
// 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, 0x00, 0x00 };
//uint8_t null_key_data16[16] = {0x00};
//uint8_t new_key_data8[8] = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77};
@ -268,46 +268,38 @@ void MifareDES_Auth1(uint8_t *datain) {
LED_B_OFF();
LED_C_OFF();
if (payload->key==NULL)
{
if (payload->mode==MFDES_AUTH_DES || payload->mode==MFDES_AUTH_PICC)
{
if (payload->key == NULL) {
if (payload->mode == MFDES_AUTH_DES || payload->mode == MFDES_AUTH_PICC) {
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);
}
}
else {
} else {
memcpy(keybytes, payload->key, payload->keylen);
}
struct desfire_key defaultkey = {0};
desfirekey_t key = &defaultkey;
if (payload->algo==MFDES_ALGO_AES) {
if (payload->algo == MFDES_ALGO_AES) {
mbedtls_aes_init(&ctx);
Desfire_aes_key_new(keybytes, key);
}
else if (payload->algo == MFDES_ALGO_3DES) {
key->type=T_3DES;
} else if (payload->algo == MFDES_ALGO_3DES) {
key->type = T_3DES;
Desfire_3des_key_new_with_version(keybytes, key);
}
else if (payload->algo == MFDES_ALGO_DES) {
key->type=T_DES;
} else if (payload->algo == MFDES_ALGO_DES) {
key->type = T_DES;
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);
}
uint8_t subcommand=AUTHENTICATE;
uint8_t subcommand = AUTHENTICATE;
if (payload->mode==MFDES_AUTH_AES)
subcommand=AUTHENTICATE_AES;
else if (payload->mode==MFDES_AUTH_ISO)
subcommand=AUTHENTICATE_ISO;
if (payload->mode == MFDES_AUTH_AES)
subcommand = AUTHENTICATE_AES;
else if (payload->mode == MFDES_AUTH_ISO)
subcommand = AUTHENTICATE_ISO;
if (payload->mode != MFDES_AUTH_PICC) {
// Let's send our auth command
@ -319,8 +311,7 @@ void MifareDES_Auth1(uint8_t *datain) {
cmd[5] = payload->keyno;
cmd[6] = 0x0;
len = DesfireAPDU(cmd, 7, resp);
}
else {
} else {
cmd[0] = AUTHENTICATE;
cmd[1] = payload->keyno;
len = DesfireAPDU(cmd, 2, resp);
@ -330,13 +321,13 @@ void MifareDES_Auth1(uint8_t *datain) {
if (DBGLEVEL >= DBG_ERROR) {
DbpString("Authentication failed. Card timeout.");
}
OnErrorNG(CMD_HF_DESFIRE_AUTH1,3);
OnErrorNG(CMD_HF_DESFIRE_AUTH1, 3);
return;
}
if (resp[2] == (uint8_t)0xaf) {
DbpString("Authentication failed. Invalid key number.");
OnErrorNG(CMD_HF_DESFIRE_AUTH1,3);
OnErrorNG(CMD_HF_DESFIRE_AUTH1, 3);
return;
}
@ -348,17 +339,16 @@ void MifareDES_Auth1(uint8_t *datain) {
}
// Part 3
if (payload->algo==MFDES_ALGO_AES) {
if (payload->algo == MFDES_ALGO_AES) {
if (mbedtls_aes_setkey_dec(&ctx, key->data, 128) != 0) {
if (DBGLEVEL >= DBG_EXTENDED) {
DbpString("mbedtls_aes_setkey_dec failed");
}
OnErrorNG(CMD_HF_DESFIRE_AUTH1,7);
OnErrorNG(CMD_HF_DESFIRE_AUTH1, 7);
return;
}
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);
else if (payload->algo == MFDES_ALGO_DES)
des_dec(&RndB, &encRndB, key->data);
@ -370,7 +360,7 @@ void MifareDES_Auth1(uint8_t *datain) {
uint8_t encRndA[16] = {0x00};
// - Encrypt our response
if (payload->mode==MFDES_AUTH_DES || payload->mode==MFDES_AUTH_PICC) {
if (payload->mode == MFDES_AUTH_DES || payload->mode == MFDES_AUTH_PICC) {
if (payload->algo == MFDES_ALGO_3DES)
tdes_dec(&encRndA, &RndA, key->data);
else if (payload->algo == MFDES_ALGO_DES)
@ -388,17 +378,16 @@ void MifareDES_Auth1(uint8_t *datain) {
des_dec(&encRndB, &rotRndB, key->data);
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};
memcpy(tmp, RndA, 16);
memcpy(tmp + 16, rotRndB, 16);
if (payload->algo==MFDES_ALGO_AES) {
if (payload->algo == MFDES_ALGO_AES) {
if (mbedtls_aes_setkey_enc(&ctx, key->data, 128) != 0) {
if (DBGLEVEL >= DBG_EXTENDED) {
DbpString("mbedtls_aes_setkey_enc failed");
}
OnErrorNG(CMD_HF_DESFIRE_AUTH1,7);
OnErrorNG(CMD_HF_DESFIRE_AUTH1, 7);
return;
}
mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_ENCRYPT, 32, IV, tmp, both);
@ -424,21 +413,20 @@ void MifareDES_Auth1(uint8_t *datain) {
if (DBGLEVEL >= DBG_ERROR) {
DbpString("Authentication failed. Card timeout.");
}
OnErrorNG(CMD_HF_DESFIRE_AUTH1,3);
OnErrorNG(CMD_HF_DESFIRE_AUTH1, 3);
return;
}
if (payload->mode != MFDES_AUTH_PICC) {
if ((resp[len - 4] != 0x91) || (resp[len - 3] != 0x00)) {
DbpString("Authentication failed.");
OnErrorNG(CMD_HF_DESFIRE_AUTH1,6);
OnErrorNG(CMD_HF_DESFIRE_AUTH1, 6);
return;
}
}
else {
} else {
if (resp[1] != 0x00) {
DbpString("Authentication failed.");
OnErrorNG(CMD_HF_DESFIRE_AUTH1,6);
OnErrorNG(CMD_HF_DESFIRE_AUTH1, 6);
return;
}
}
@ -452,23 +440,21 @@ void MifareDES_Auth1(uint8_t *datain) {
if (payload->mode != MFDES_AUTH_PICC) {
memcpy(encRndA, resp + 1, payload->keylen);
}
else {
} else {
memcpy(encRndA, resp + 2, payload->keylen);
}
if (payload->mode==MFDES_AUTH_DES || payload->mode==MFDES_AUTH_PICC) {
if (payload->mode == MFDES_AUTH_DES || payload->mode == MFDES_AUTH_PICC) {
if (payload->algo == MFDES_ALGO_3DES)
tdes_dec(&encRndA, &encRndA, key->data);
else if (payload->algo == MFDES_ALGO_DES)
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 (DBGLEVEL >= DBG_EXTENDED) {
DbpString("mbedtls_aes_setkey_dec failed");
}
OnErrorNG(CMD_HF_DESFIRE_AUTH1,7);
OnErrorNG(CMD_HF_DESFIRE_AUTH1, 7);
return;
}
mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_DECRYPT, 16, IV, encRndA, encRndA);
@ -482,7 +468,7 @@ void MifareDES_Auth1(uint8_t *datain) {
for (int x = 0; x < payload->keylen; x++) {
if (RndA[x] != encRndA[x]) {
DbpString("Authentication failed. Cannot verify Session Key.");
OnErrorNG(CMD_HF_DESFIRE_AUTH1,4);
OnErrorNG(CMD_HF_DESFIRE_AUTH1, 4);
return;
}
}
@ -589,8 +575,8 @@ void MifareDES_Auth1(uint8_t *datain) {
} PACKED;
struct r rpayload;
rpayload.sessionkeylen=payload->keylen;
memcpy(rpayload.sessionkey,skey->data,rpayload.sessionkeylen);
rpayload.sessionkeylen = payload->keylen;
memcpy(rpayload.sessionkey, skey->data, rpayload.sessionkeylen);
reply_ng(CMD_HF_DESFIRE_AUTH1, PM3_SUCCESS, (uint8_t *)&rpayload, sizeof(payload));
LED_B_OFF();
}

36
client/cmdhfmfdes.c
View file

@ -859,12 +859,12 @@ static int CmdHF14ADesFormatPICC(const char *Cmd) {
uint8_t key[24];
uint8_t keylen;
} PACKED payload;
payload.keylen=keylen;
memcpy(payload.key,key,keylen);
payload.mode=MFDES_AUTH_PICC;
payload.algo=MFDES_ALGO_DES;
payload.keyno=0;
SendCommandNG(CMD_HF_DESFIRE_AUTH1,(uint8_t*)&payload,sizeof(payload));
payload.keylen = keylen;
memcpy(payload.key, key, keylen);
payload.mode = MFDES_AUTH_PICC;
payload.algo = MFDES_ALGO_DES;
payload.keyno = 0;
SendCommandNG(CMD_HF_DESFIRE_AUTH1, (uint8_t *)&payload, sizeof(payload));
PacketResponseNG resp;
if (!WaitForResponseTimeout(CMD_HF_DESFIRE_AUTH1, &resp, 3000)) {
@ -873,23 +873,23 @@ static int CmdHF14ADesFormatPICC(const char *Cmd) {
return PM3_ETIMEOUT;
}
uint8_t isOK = (resp.status==PM3_SUCCESS);
uint8_t isOK = (resp.status == PM3_SUCCESS);
if (isOK) {
struct {
uint8_t flags;
uint8_t datalen;
uint8_t datain[FRAME_PAYLOAD_SIZE];
} PACKED payload;
payload.datain[0]=0xFC;
payload.flags=NONE;
payload.datalen=1;
SendCommandNG(CMD_HF_DESFIRE_COMMAND,(uint8_t*)&payload,sizeof(payload));
payload.datain[0] = 0xFC;
payload.flags = NONE;
payload.datalen = 1;
SendCommandNG(CMD_HF_DESFIRE_COMMAND, (uint8_t *)&payload, sizeof(payload));
if (!WaitForResponseTimeout(CMD_HF_DESFIRE_COMMAND, &resp, 3000)) {
PrintAndLogEx(WARNING, "Client reset command execute timeout");
DropField();
return PM3_ETIMEOUT;
}
if (resp.status==PM3_SUCCESS) {
if (resp.status == PM3_SUCCESS) {
/*struct r {
uint8_t len;
uint8_t data[RECEIVE_SIZE];
@ -1528,12 +1528,12 @@ static int CmdHF14ADesAuth(const char *Cmd) {
uint8_t key[24];
uint8_t keylen;
} PACKED payload;
payload.keylen=keylength;
memcpy(payload.key,key,keylength);
payload.mode=cmdAuthMode;
payload.algo=cmdAuthAlgo;
payload.keyno=cmdKeyNo;
SendCommandNG(CMD_HF_DESFIRE_AUTH1,(uint8_t*)&payload,sizeof(payload));
payload.keylen = keylength;
memcpy(payload.key, key, keylength);
payload.mode = cmdAuthMode;
payload.algo = cmdAuthAlgo;
payload.keyno = cmdKeyNo;
SendCommandNG(CMD_HF_DESFIRE_AUTH1, (uint8_t *)&payload, sizeof(payload));
PacketResponseNG resp;