mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-09-24 01:06:14 +08:00
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
This commit is contained in:
commit
4dcdbf4bba
|
@ -1279,7 +1279,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
|
|||
}
|
||||
|
||||
// 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(INFO, "\t Try use " _YELLOW_("`hf mf staticnested`"));
|
||||
return PM3_EOPABORTED;
|
||||
|
@ -1839,7 +1839,7 @@ static int CmdHF14AMfNestedHard(const char *Cmd) {
|
|||
if (!know_target_key && nonce_file_read == false) {
|
||||
|
||||
// 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(INFO, "\t Try use `" _YELLOW_("hf mf staticnested") "`");
|
||||
return PM3_EOPABORTED;
|
||||
|
|
|
@ -1845,7 +1845,6 @@ static bool TestIfKeyExists(uint64_t key) {
|
|||
num_keys_tested += count;
|
||||
hardnested_print_progress(num_acquired_nonces, "(Test: Key found)", 0.0, 0);
|
||||
crypto1_destroy(pcs);
|
||||
pthread_mutex_destroy(&statelist_cache_mutex);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -1853,7 +1852,6 @@ static bool TestIfKeyExists(uint64_t key) {
|
|||
num_keys_tested += count;
|
||||
hardnested_print_progress(num_acquired_nonces, "(Test: Key NOT found)", 0.0, 0);
|
||||
crypto1_destroy(pcs);
|
||||
pthread_mutex_destroy(&statelist_cache_mutex);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue