Merge pull request #2090 from p51d78th/master

Fix macOS errors while building after cryptoRF solvers was added.
RfidResearchGroup · Aug 24, 2023 · e99fcee · e99fcee
2 parents db7a8e1 + 760bfbb
commit e99fcee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/tools/cryptorf/Makefile b/tools/cryptorf/Makefile
@@ -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

diff --git a/tools/cryptorf/sma.cpp b/tools/cryptorf/sma.cpp
@@ -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());