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

Merge pull request #2090 from p51d78th/master

Browse source 
Fix macOS errors while building after cryptoRF solvers was added.
This commit is contained in:
Iceman 2023-08-24 08:16:38 +02:00 committed by GitHub
commit e99fceef1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/cryptorf/Makefile
View file

@ -8,6 +8,12 @@ MYLDLIBS = -lpthread
BINS = cm sm sma sma_multi
INSTALLTOOLS = $(BINS)
platform = $(shell uname)
ifeq ($(platform),Darwin)
CXXFLAGS = -std=c++14
endif
include ../../Makefile.host
# checking platform can be done only after Makefile.host

4
tools/cryptorf/sma.cpp
View file

@ -671,13 +671,12 @@ static inline void search_gc_candidates_left(const uint64_t lstate_before_gc, co
void combine_valid_left_right_states(vector<cs_t> *plcstates, vector<cs_t> *prcstates, vector<uint64_t> *pgc_candidates) {
vector<cs_t>::iterator itl, itr;
size_t pos, count;
size_t pos;
uint64_t gc;
bool valid;
// Clean up the candidate list
pgc_candidates->clear();
count = 0;
for (itl = plcstates->begin(); itl != plcstates->end(); ++itl) {
for (itr = prcstates->begin(); itr != prcstates->end(); ++itr) {
valid = true;
@ -700,7 +699,6 @@ void combine_valid_left_right_states(vector<cs_t> *plcstates, vector<cs_t> *prcs
// printf("%09llx - ",itl->l);
// printf("%07llx\n",itr->r);
}
count++;
}
}
printf("Found a total of " _YELLOW_("%llu")" combinations, ", ((unsigned long long)plcstates->size()) * prcstates->size());