RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-13 18:57:12 +08:00
Code Issues Projects Releases Packages Wiki Activity

FIX: "hf mf hardnested" when "key found" exting the do-while loop doesn't need to wait for device to respond.

Browse source
This commit is contained in:
iceman1001 2016-11-07 11:54:32 +01:00
parent 8e4a0b3585
commit 87a513aa1d
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/cmdhfmfhard.c
View file

@ -1,6 +1,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 2015 piwi
// fiddled with 2016 Azcid (hardnested bitsliced Bruteforce imp)
// fiddled with 2016 Matrix ( sub testing of nonces while collecting )
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
// at your option, any later version. See the LICENSE.txt file for the text of
// the license.
@ -772,7 +773,7 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
clearCommandBuffer();
SendCommand(&c);
if (field_off) finished = true;
if (field_off) break;
if (initialize) {
if (!WaitForResponseTimeout(CMD_ACK, &resp, 3000)) return 1;
@ -1382,10 +1383,11 @@ static void free_statelist_cache(void)
}
}
#define MAX_BUCKETS 128
uint64_t foundkey = 0;
size_t keys_found = 0;
size_t bucket_count = 0;
statelist_t* buckets[128];
statelist_t* buckets[MAX_BUCKETS];
size_t total_states_tested = 0;
size_t thread_count = 4;
@ -1686,7 +1688,7 @@ static bool brute_force(void)
// count number of states to go
bucket_count = 0;
for (statelist_t *p = candidates; p != NULL && bucket_count < 128; p = p->next) {
for (statelist_t *p = candidates; p != NULL && bucket_count < MAX_BUCKETS; p = p->next) {
buckets[bucket_count] = p;
bucket_count++;
}