dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3

Browse Source
This commit is contained in:
root
2020-02-24 14:40:25 -05:00
parent 7750fe24e1 b87b0313da
commit 4dcdbf4bba
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/cmdhfmf.c
View File

@@ -1279,7 +1279,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
} }
// check if tag doesn't have static nonce // check if tag doesn't have static nonce
if (detect_classic_static_nonce() != 0) { if (detect_classic_static_nonce() == 1) {
PrintAndLogEx(WARNING, "Static nonce detected. Quitting..."); PrintAndLogEx(WARNING, "Static nonce detected. Quitting...");
PrintAndLogEx(INFO, "\t Try use " _YELLOW_("`hf mf staticnested`")); PrintAndLogEx(INFO, "\t Try use " _YELLOW_("`hf mf staticnested`"));
return PM3_EOPABORTED; return PM3_EOPABORTED;
@@ -1839,7 +1839,7 @@ static int CmdHF14AMfNestedHard(const char *Cmd) {
if (!know_target_key && nonce_file_read == false) { if (!know_target_key && nonce_file_read == false) {
// check if tag doesn't have static nonce // check if tag doesn't have static nonce
if (detect_classic_static_nonce() != 0) { if (detect_classic_static_nonce() == 1) {
PrintAndLogEx(WARNING, "Static nonce detected. Quitting..."); PrintAndLogEx(WARNING, "Static nonce detected. Quitting...");
PrintAndLogEx(INFO, "\t Try use `" _YELLOW_("hf mf staticnested") "`"); PrintAndLogEx(INFO, "\t Try use `" _YELLOW_("hf mf staticnested") "`");
return PM3_EOPABORTED; return PM3_EOPABORTED;

2
client/cmdhfmfhard.c
View File

@@ -1845,7 +1845,6 @@ static bool TestIfKeyExists(uint64_t key) {
num_keys_tested += count; num_keys_tested += count;
hardnested_print_progress(num_acquired_nonces, "(Test: Key found)", 0.0, 0); hardnested_print_progress(num_acquired_nonces, "(Test: Key found)", 0.0, 0);
crypto1_destroy(pcs); crypto1_destroy(pcs);
pthread_mutex_destroy(&statelist_cache_mutex);
return true; return true;
} }
} }
@@ -1853,7 +1852,6 @@ static bool TestIfKeyExists(uint64_t key) {
num_keys_tested += count; num_keys_tested += count;
hardnested_print_progress(num_acquired_nonces, "(Test: Key NOT found)", 0.0, 0); hardnested_print_progress(num_acquired_nonces, "(Test: Key NOT found)", 0.0, 0);
crypto1_destroy(pcs); crypto1_destroy(pcs);
pthread_mutex_destroy(&statelist_cache_mutex);
return false; return false;
} }