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

clean up and proper init

Browse source
This commit is contained in:
iceman1001 2020-08-19 23:00:08 +02:00
parent 33b2b1e8b9
commit 2c930064a3
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/cryptorf/sma_multi.cpp
View file

@ -375,7 +375,6 @@ std::atomic<size_t> topbits{0};
std::mutex g_ice_mtx;
uint32_t g_num_cpus = std::thread::hardware_concurrency();
static void ice_sm_right_thread(
uint8_t offset,
uint8_t skips,
@ -450,7 +449,6 @@ static void ice_sm_right_thread(
}
static uint32_t ice_sm_right(const uint8_t *ks, uint8_t *mask, vector<uint64_t> *pcrstates) {
uint32_t g_num_cpus = std::thread::hardware_concurrency();
map<uint64_t, uint64_t> bincstates;
topbits = ATOMIC_VAR_INIT(0);
@ -497,7 +495,6 @@ static void ice_sm_left_thread(
memset(&state, 0x00, sizeof(cs_t));
state.invalid = false;
for (uint64_t counter = offset; counter < 0x800000000ull; counter += skips) {
uint64_t lstate = counter;
@ -567,8 +564,6 @@ static void ice_sm_left_thread(
static void ice_sm_left(const uint8_t *ks, uint8_t *mask, vector<cs_t> *pcstates) {
uint32_t g_num_cpus = std::thread::hardware_concurrency();
map<uint64_t, cs_t> bincstates;
std::vector<std::thread> threads(g_num_cpus);
for (uint8_t m = 0; m < g_num_cpus; m++) {
@ -967,7 +962,6 @@ static void ice_compare(
return;
}
int main(int argc, const char *argv[]) {
size_t pos;
crypto_state_t ostate;
@ -1119,7 +1113,7 @@ int main(int argc, const char *argv[]) {
key_found = ATOMIC_VAR_INIT(false);
key = ATOMIC_VAR_INIT(0);
std::vector<std::thread> threads(g_num_cpus);
for (uint8_t m = 0; m < g_num_cpus; m++) {
threads[m] = std::thread(ice_compare, m, g_num_cpus, &pgc_candidates, &ostate, ref(Ci), ref(Q), ref(Ch), ref(Ci_1));