From: Iceman <iceman@iuse.se>
Date: Sat, 1 Jul 2017 19:22:55 +0000 (+0200)
Subject: Merge pull request #345 from pwpiwi/hardnested_compress
X-Git-Tag: v3.1.0~197
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/138927dd7b9be11990ac7073cdd1906b78683a76?hp=7f9e4c257f2209cf1b748b85eb85d7cf07eb86cd

Merge pull request #345 from pwpiwi/hardnested_compress

hardnested: dramatically reduce required disk space for tables
---

diff --git a/COMPILING.txt b/COMPILING.txt
index 73201f25..bd5bef1c 100644
--- a/COMPILING.txt
+++ b/COMPILING.txt
@@ -3,7 +3,7 @@ The project compiles on Linux, Mac OS X and Windows (MinGW/MSYS).
 it requires:
 - gcc >= 4.4
 - libpthread
-- libreadline
+- GNU libreadline or BSD libedit (editline)
 - libusb
 - perl
 - an ARM cross-compiler to compile the firmware
@@ -109,7 +109,7 @@ Tested on OSX 10.10 Yosemite
 1 - Install Xcode and Xcode Command Line Tools
 
 2 - Install Homebrew and dependencies
-    brew install readline libusb p7zip libusb-compat wget qt5 pkgconfig
+    brew install libusb p7zip libusb-compat wget qt5 pkgconfig
 
 3 - Install DevKitARM for OSX
     Option 1:
@@ -119,12 +119,10 @@ Tested on OSX 10.10 Yosemite
         brew tap nitsky/stm32
         brew install arm-none-eabi-gcc
 
-4 - Edit proxmark3/client/Makefile adding path to readline and qt5
+4 - Edit proxmark3/client/Makefile adding path qt5
 
-    LDLIBS = -L/usr/local/opt/readline/lib -L/usr/local/opt/qt5/lib -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lreadline -lpthread -lm
-    CFLAGS = -std=c99 -I/usr/local/opt/qt5/include -I/usr/local/opt/readline/include -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
-
-    If your old brew intallation use /usr/local/Cellar/ path replace /usr/local/opt/readline/lib with your actuall readline and qt5 path. See homebrew manuals.
+    LDLIBS = -L/usr/local/opt/qt5/lib -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lreadline -lpthread -lm
+    CFLAGS = -std=c99 -I/usr/local/opt/qt5/include -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
 
 5 - Set Environment
 
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 258a5578..bab3591e 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -26,6 +26,7 @@
 #include "cmdmain.h"
 #include "mifare.h"
 #include "cmdhfmfu.h"
+#include "mifarehost.h"
 
 static int CmdHelp(const char *Cmd);
 static void waitCmd(uint8_t iLen);
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index e8050d25..fd5fbbf9 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -71,6 +71,7 @@ static float brute_force_per_second;
 
 
 static void get_SIMD_instruction_set(char* instruction_set) {
+#if defined (__i386__) || defined (__x86_64__)	
 	#if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8))
 		#if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
 	if (__builtin_cpu_supports("avx512f")) strcpy(instruction_set, "AVX512F");
@@ -83,7 +84,8 @@ static void get_SIMD_instruction_set(char* instruction_set) {
 	else if (__builtin_cpu_supports("mmx")) strcpy(instruction_set, "MMX");
 	else 
 	#endif
-		strcpy(instruction_set, "unsupported");
+#endif
+		strcpy(instruction_set, "no");
 }
 
 
diff --git a/client/ui.c b/client/ui.c
index 05e29dc7..df2c3ce3 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -48,7 +48,9 @@ void PrintAndLog(char *fmt, ...)
 			logging=0;
 		}
 	}
-	
+
+#ifdef RL_STATE_READCMD
+	// We are using GNU readline.
 	int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0;
 
 	if (need_hack) {
@@ -58,6 +60,10 @@ void PrintAndLog(char *fmt, ...)
 		rl_replace_line("", 0);
 		rl_redisplay();
 	}
+#else
+	// We are using libedit (OSX), which doesn't support this flag.
+	int need_hack = 0;
+#endif
 	
 	va_start(argptr, fmt);
 	va_copy(argptr2, argptr);