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

move rng info and add static encrypted nonce detect placeholder

Browse source
This commit is contained in:
merlokk 2023-12-11 19:17:03 +02:00
commit edd004adc5
1 changed files with 31 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

59
client/src/cmdhfmf.c
View file

@ -8863,30 +8863,6 @@ static int CmdHF14AMfInfo(const char *Cmd) {
if (setDeviceDebugLevel(DBG_NONE, false) != PM3_SUCCESS) if (setDeviceDebugLevel(DBG_NONE, false) != PM3_SUCCESS)
return PM3_EFAILED; return PM3_EFAILED;
PrintAndLogEx(INFO, "--- " _CYAN_("RNG Information") "---------------------");
int res = detect_classic_static_nonce();
if (res == NONCE_STATIC)
PrintAndLogEx(SUCCESS, "Static nonce: " _YELLOW_("yes"));
if (res == NONCE_FAIL && verbose)
PrintAndLogEx(SUCCESS, "Static nonce: " _RED_("read failed"));
if (res == NONCE_NORMAL) {
// not static
res = detect_classic_prng();
if (res == 1)
PrintAndLogEx(SUCCESS, "Prng detection: " _GREEN_("weak"));
else if (res == 0)
PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_("hard"));
else
PrintAndLogEx(FAILED, "Prng detection: " _RED_("fail"));
if (do_nack_test)
detect_classic_nackbug(verbose);
}
PrintAndLogEx(INFO, "--- " _CYAN_("Backdoors Information") "---------------------"); PrintAndLogEx(INFO, "--- " _CYAN_("Backdoors Information") "---------------------");
if (detect_mf_magic(true) == 0) if (detect_mf_magic(true) == 0)
PrintAndLogEx(INFO, "<none>"); PrintAndLogEx(INFO, "<none>");
@ -8898,9 +8874,9 @@ static int CmdHF14AMfInfo(const char *Cmd) {
int sectorsCnt = 1; int sectorsCnt = 1;
uint8_t *keyBlock = NULL; uint8_t *keyBlock = NULL;
uint32_t keycnt = 0; uint32_t keycnt = 0;
int ret = mfLoadKeys(&keyBlock, &keycnt, NULL, 0, NULL, 0); int res = mfLoadKeys(&keyBlock, &keycnt, NULL, 0, NULL, 0);
if (ret != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
return ret; return res;
} }
// create/initialize key storage structure // create/initialize key storage structure
@ -8938,6 +8914,34 @@ static int CmdHF14AMfInfo(const char *Cmd) {
free(keyBlock); free(keyBlock);
free(e_sector); free(e_sector);
PrintAndLogEx(INFO, "--- " _CYAN_("RNG Information") "---------------------");
res = detect_classic_static_nonce();
if (res == NONCE_STATIC)
PrintAndLogEx(SUCCESS, "Static nonce: " _YELLOW_("yes"));
if (res == NONCE_FAIL && verbose)
PrintAndLogEx(SUCCESS, "Static nonce: " _RED_("read failed"));
if (res == NONCE_NORMAL) {
// not static
res = detect_classic_prng();
if (res == 1)
PrintAndLogEx(SUCCESS, "Prng detection: " _GREEN_("weak"));
else if (res == 0)
PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_("hard"));
else
PrintAndLogEx(FAILED, "Prng detection: " _RED_("fail"));
// detect static encrypted nonce
if (keyType != 0xff) {
}
if (do_nack_test)
detect_classic_nackbug(verbose);
}
uint8_t signature[32] = {0}; uint8_t signature[32] = {0};
res = read_mfc_ev1_signature(signature); res = read_mfc_ev1_signature(signature);
@ -8949,7 +8953,6 @@ static int CmdHF14AMfInfo(const char *Cmd) {
if (setDeviceDebugLevel(dbg_curr, false) != PM3_SUCCESS) if (setDeviceDebugLevel(dbg_curr, false) != PM3_SUCCESS)
return PM3_EFAILED; return PM3_EFAILED;
PrintAndLogEx(NORMAL, "done...");
return PM3_SUCCESS; return PM3_SUCCESS;
} }