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

Fix key length in auth1 command.

Browse source
This commit is contained in:
Thomas Sutter 2019-12-16 14:08:30 +01:00
commit 47a416a3ac
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/cmdhffelica.c
View file

@ -305,9 +305,9 @@ static int usage_hf_felica_authentication1() {
PrintAndLogEx(NORMAL, " -h this help"); PrintAndLogEx(NORMAL, " -h this help");
PrintAndLogEx(NORMAL, " -i <0A0B0C ... hex> set custom IDm to use"); PrintAndLogEx(NORMAL, " -i <0A0B0C ... hex> set custom IDm to use");
PrintAndLogEx(NORMAL, "\nExamples: "); PrintAndLogEx(NORMAL, "\nExamples: ");
PrintAndLogEx(NORMAL, " hf felica auth1 01 0000 01 8B00 FFFFFFFFFFFFFFFF "); PrintAndLogEx(NORMAL, " hf felica auth1 01 0000 01 8B00 AAAAAAAAAAAAAAAABBBBBBBBBBBBBBBB ");
PrintAndLogEx(NORMAL, " hf felica auth1 01 0000 01 8B00 FFFFFFFFAAAAAAAAFFFFFFFF "); PrintAndLogEx(NORMAL, " hf felica auth1 01 0000 01 8B00 AAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBAAAAAAAAAAAAAAAA ");
PrintAndLogEx(NORMAL, " hf felica auth1 -i 11100910C11BC407 01 0000 01 8B00 FFFFFFFFFFFFFFFF\n\n"); PrintAndLogEx(NORMAL, " hf felica auth1 -i 11100910C11BC407 01 0000 01 8B00 AAAAAAAAAAAAAAAABBBBBBBBBBBBBBBB\n\n");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -597,14 +597,14 @@ static int CmdHFFelicaAuthentication1(const char *Cmd) {
uint8_t master_key[PM3_CMD_DATA_SIZE]; uint8_t master_key[PM3_CMD_DATA_SIZE];
mbedtls_des3_context des3_ctx; mbedtls_des3_context des3_ctx;
mbedtls_des3_init(&des3_ctx); mbedtls_des3_init(&des3_ctx);
if (param_getlength(Cmd, paramCount) == 24) { if (param_getlength(Cmd, paramCount) == 48) {
param_gethex(Cmd, paramCount, master_key, 24); param_gethex(Cmd, paramCount, master_key, 48);
mbedtls_des3_set3key_enc(&des3_ctx, master_key); mbedtls_des3_set3key_enc(&des3_ctx, master_key);
PrintAndLogEx(INFO, "3DES Master Secret: %s", sprint_hex(master_key, 12)); PrintAndLogEx(INFO, "3DES Master Secret: %s", sprint_hex(master_key, 24));
} else if (param_getlength(Cmd, paramCount) == 16) { } else if (param_getlength(Cmd, paramCount) == 32) {
param_gethex(Cmd, paramCount, master_key, 16); param_gethex(Cmd, paramCount, master_key, 32);
mbedtls_des3_set2key_enc(&des3_ctx, master_key); mbedtls_des3_set2key_enc(&des3_ctx, master_key);
PrintAndLogEx(INFO, "3DES Master Secret: %s", sprint_hex(master_key, 8)); PrintAndLogEx(INFO, "3DES Master Secret: %s", sprint_hex(master_key, 16));
} else { } else {
PrintAndLogEx(ERR, "Invalid key length"); PrintAndLogEx(ERR, "Invalid key length");
return PM3_EINVARG; return PM3_EINVARG;