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

Merge pull request #813 from bkerler/master

Browse source 
Fix mfdes missing num_keys
This commit is contained in:
Iceman 2020-06-24 09:42:11 +02:00 • committed by GitHub
commit 0bcec9a3fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
client/src/cmdhfmfdes.c
View file

@ -1240,15 +1240,14 @@ static int handler_desfire_signature(uint8_t *signature, size_t *signature_len)
} }
// --- KEY SETTING // --- KEY SETTING
static int desfire_print_keysetting(uint8_t key_settings, mifare_des_authalgo_t algo) { static int desfire_print_keysetting(uint8_t key_settings, uint8_t num_keys, int algo) {
PrintAndLogEx(SUCCESS, " AID Key settings : 0x%02x", key_settings); PrintAndLogEx(SUCCESS, " AID Key settings : 0x%02x", key_settings);
// 2 MSB denotes // 2 MSB denotes
const char *str = " Max key number and type : %d, " _YELLOW_("%s"); const char *str = " Max key number and type : %d, " _YELLOW_("%s");
if (algo == MFDES_ALGO_DES) PrintAndLogEx(SUCCESS, str, "(3)DES"); if (algo == MFDES_ALGO_DES) PrintAndLogEx(SUCCESS, str, num_keys & 0x3F, "(3)DES");
else if (algo == MFDES_ALGO_AES) PrintAndLogEx(SUCCESS, str, "AES"); else if (algo == MFDES_ALGO_AES) PrintAndLogEx(SUCCESS, str, num_keys & 0x3F, "AES");
else if (algo == MFDES_ALGO_3K3DES) PrintAndLogEx(SUCCESS, str, "3K3DES"); else if (algo == MFDES_ALGO_3K3DES) PrintAndLogEx(SUCCESS, str, num_keys & 0x3F, "3K3DES");
//PrintAndLogEx(SUCCESS, " Max number of keys in AID : %d", num_keys & 0x3F); //PrintAndLogEx(SUCCESS, " Max number of keys in AID : %d", num_keys & 0x3F);
PrintAndLogEx(INFO, "-------------------------------------------------------------"); PrintAndLogEx(INFO, "-------------------------------------------------------------");
@ -1449,14 +1448,14 @@ static int handler_desfire_select_application(uint8_t *aid) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int key_setting_to_algo(uint8_t aid[3], uint8_t *key_setting, mifare_des_authalgo_t *algo) { static int key_setting_to_algo(uint8_t aid[3], uint8_t *key_setting, mifare_des_authalgo_t *algo, uint8_t *num_keys) {
int res = handler_desfire_select_application(aid); int res = handler_desfire_select_application(aid);
if (res != PM3_SUCCESS) return res; if (res != PM3_SUCCESS) return res;
uint8_t num_keys = 0; *num_keys = 0;
res = handler_desfire_getkeysettings(key_setting, &num_keys); res = handler_desfire_getkeysettings(key_setting, num_keys);
if (res == PM3_SUCCESS) { if (res == PM3_SUCCESS) {
switch (num_keys >> 6) { switch (*num_keys >> 6) {
case 0: case 0:
*algo = MFDES_ALGO_DES; *algo = MFDES_ALGO_DES;
break; break;
@ -1863,8 +1862,8 @@ static int getKeySettings(uint8_t *aid) {
// KEY Settings - AMK // KEY Settings - AMK
uint8_t num_keys = 0; uint8_t num_keys = 0;
uint8_t key_setting = 0; uint8_t key_setting = 0;
mifare_des_authalgo_t algo; mifare_des_authalgo_t algo=MFDES_ALGO_DES;
res = key_setting_to_algo(aid, &key_setting, &algo); res = key_setting_to_algo(aid, &key_setting, &algo, &num_keys);
if (res == PM3_SUCCESS) { if (res == PM3_SUCCESS) {
// number of Master keys (0x01) // number of Master keys (0x01)
@ -1915,10 +1914,10 @@ static int getKeySettings(uint8_t *aid) {
// KEY Settings - AMK // KEY Settings - AMK
uint8_t num_keys = 0; uint8_t num_keys = 0;
uint8_t key_setting = 0; uint8_t key_setting = 0;
mifare_des_authalgo_t algo; mifare_des_authalgo_t algo=MFDES_ALGO_DES;
res = key_setting_to_algo(aid, &key_setting, &algo); res = key_setting_to_algo(aid, &key_setting, &algo, &num_keys);
if (res == PM3_SUCCESS) { if (res == PM3_SUCCESS) {
desfire_print_keysetting(key_setting, algo); desfire_print_keysetting(key_setting, num_keys, algo);
} else { } else {
PrintAndLogEx(WARNING, _RED_(" Can't read Application Master key settings")); PrintAndLogEx(WARNING, _RED_(" Can't read Application Master key settings"));
} }