Update appmain.c

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 2f8530934297564b86c4f610ec560c5265084012..bf64280304c5683212529ad2fa82f8de9e123074 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -12,15 +12,16 @@ TARFLAGS = -C .. --ignore-failed-read -rvf
 RM = rm -f
 MV = mv
 
 RM = rm -f
 MV = mv
 

-#COMMON_FLAGS = -m32
-VPATH = ../common ../zlib
+ENV_LDFLAGS := $(LDFLAGS)
+ENV_CFLAGS := $(CFLAGS)
+VPATH = ../common ../zlib ../uart

 OBJDIR = obj
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
 OBJDIR = obj
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a

-LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O3
-CXXFLAGS = -std=c++11 -fPIC -Wall -O3
+LDFLAGS = $(ENV_LDFLAGS)
+CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../common/polarssl -I../zlib -I../uart -I/opt/local/include -I../liblua -Wall -g -O3
+CXXFLAGS = -I../include -Wall -O3

 
 LUAPLATFORM = generic
 platform = $(shell uname)
 
 LUAPLATFORM = generic
 platform = $(shell uname)


@@ -42,11 +43,13 @@ QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null)
 MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc
 UIC = $(shell pkg-config --variable=host_bins Qt5Core)/uic
 ifeq ($(QTINCLUDES), )
 MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc
 UIC = $(shell pkg-config --variable=host_bins Qt5Core)/uic
 ifeq ($(QTINCLUDES), )

-# if Qt5 not found Check for correctly configured Qt4  
+# if Qt5 not found check for correctly configured Qt4  

        QTINCLUDES = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null)
        QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
        MOC = $(shell pkg-config --variable=moc_location QtCore)
        UIC = $(shell pkg-config --variable=uic_location QtCore)
        QTINCLUDES = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null)
        QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
        MOC = $(shell pkg-config --variable=moc_location QtCore)
        UIC = $(shell pkg-config --variable=uic_location QtCore)

+else
+       CXXFLAGS += -std=c++11 -fPIC

 endif
 ifeq ($(QTINCLUDES), )
 # if both pkg-config commands failed, search in common places
 endif
 ifeq ($(QTINCLUDES), )
 # if both pkg-config commands failed, search in common places


@@ -56,6 +59,7 @@ ifeq ($(QTINCLUDES), )
                ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
                        QTINCLUDES += -I$(QTDIR)/include/QtWidgets
                        QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core
                ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
                        QTINCLUDES += -I$(QTDIR)/include/QtWidgets
                        QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core

+                       CXXFLAGS += -std=c++11 -fPIC

                endif
                MOC = $(QTDIR)/bin/moc
                UIC = $(QTDIR)/bin/uic
                endif
                MOC = $(QTDIR)/bin/moc
                UIC = $(QTDIR)/bin/uic


@@ -75,15 +79,21 @@ DEPFLAGS = -MT $@ -MMD -MP -MF $(OBJDIR)/$*.Td
 # make temporary to final dependeny files after successful compilation
 POSTCOMPILE = $(MV) -f $(OBJDIR)/$*.Td $(OBJDIR)/$*.d
 
 # make temporary to final dependeny files after successful compilation
 POSTCOMPILE = $(MV) -f $(OBJDIR)/$*.Td $(OBJDIR)/$*.d
 

-CORESRCS =     uart.c \
-                       util.c
+CORESRCS =     uart_posix.c \
+                       uart_win32.c \
+                       util.c \
+                       util_posix.c

 
 CMDSRCS =      crapto1/crapto1.c\
                        crapto1/crypto1.c\
 
 CMDSRCS =      crapto1/crapto1.c\
                        crapto1/crypto1.c\

+                       polarssl/des.c \
+                       polarssl/aes.c\
+                       polarssl/bignum.c\
+                       polarssl/rsa.c\
+                       polarssl/sha1.c\

                        mfkey.c\
                        loclass/cipher.c \
                        loclass/cipherutils.c \
                        mfkey.c\
                        loclass/cipher.c \
                        loclass/cipherutils.c \

-                       loclass/des.c \

                        loclass/ikeys.c \
                        loclass/elite_crack.c\
                        loclass/fileutils.c\
                        loclass/ikeys.c \
                        loclass/elite_crack.c\
                        loclass/fileutils.c\


@@ -100,6 +110,23 @@ CMDSRCS =  crapto1/crapto1.c\
                        ui.c \
                        cmddata.c \
                        lfdemod.c \
                        ui.c \
                        cmddata.c \
                        lfdemod.c \

+                       emv/crypto_polarssl.c\
+                       emv/crypto.c\
+                       emv/emv_pk.c\
+                       emv/emv_pki.c\
+                       emv/emv_pki_priv.c\
+                       emv/test/cryptotest.c\
+                       emv/apduinfo.c\
+                       emv/dump.c\
+                       emv/tlv.c\
+                       emv/emv_tags.c\
+                       emv/dol.c\
+                       emv/emvcore.c\
+                       emv/test/crypto_test.c\
+                       emv/test/sda_test.c\
+                       emv/test/dda_test.c\
+                       emv/test/cda_test.c\
+                       emv/cmdemv.c\

                        cmdhf.c \
                        cmdhf14a.c \
                        cmdhf14b.c \
                        cmdhf.c \
                        cmdhf14a.c \
                        cmdhf14b.c \


@@ -109,6 +136,8 @@ CMDSRCS =   crapto1/crapto1.c\
                        cmdhficlass.c \
                        cmdhfmf.c \
                        cmdhfmfu.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
                        cmdhfmfu.c \

+                       cmdhfmfhard.c \
+                       hardnested/hardnested_bruteforce.c \

                        cmdhftopaz.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdhftopaz.c \
                        cmdhw.c \
                        cmdlf.c \


@@ -133,22 +162,25 @@ CMDSRCS =         crapto1/crapto1.c\
                        cmdlfti.c \
                        cmdlfviking.c\
                        cmdlfvisa2000.c\
                        cmdlfti.c \
                        cmdlfviking.c\
                        cmdlfvisa2000.c\

+                       cmdlfpac.c\

                        cmdparser.c \
                        cmdmain.c \
                        scripting.c\
                        cmdscript.c\
                        pm3_binlib.c\
                        pm3_bitlib.c\
                        cmdparser.c \
                        cmdmain.c \
                        scripting.c\
                        cmdscript.c\
                        pm3_binlib.c\
                        pm3_bitlib.c\

-                       aes.c\
-                       protocols.c\
-                       sha1.c\
-                       cmdcrc.c\
-                       reveng/reveng.c\
-                       reveng/cli.c\
-                       reveng/bmpbit.c\
-                       reveng/model.c\
-                       reveng/poly.c\
-                       reveng/getopt.c\
+                       protocols.c
+
+cpu_arch = $(shell uname -m)
+ifneq ($(findstring 86, $(cpu_arch)), )
+       MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c
+endif
+ifneq ($(findstring amd64, $(cpu_arch)), )
+       MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c
+endif
+ifeq ($(MULTIARCHSRCS), )
+       CMDSRCS += hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c
+endif

 
 ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
 ZLIBFLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED 
 
 ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
 ZLIBFLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED 


@@ -159,19 +191,41 @@ QTGUISRCS = proxgui.cpp proxguiqt.cpp proxguiqt.moc.cpp guidummy.cpp
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)

-
+MULTIARCHOBJS = $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_NOSIMD.o) \
+                       $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_MMX.o) \
+                       $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_SSE2.o) \
+                       $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX.o) \
+                       $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX2.o)
+
+SUPPORTS_AVX512 :=  $(shell echo | gcc -E -mavx512f - > /dev/null 2>&1 && echo "True" )
+HARD_SWITCH_NOSIMD = -mno-mmx -mno-sse2 -mno-avx -mno-avx2
+HARD_SWITCH_MMX = -mmmx -mno-sse2 -mno-avx -mno-avx2
+HARD_SWITCH_SSE2 = -mmmx -msse2 -mno-avx -mno-avx2
+HARD_SWITCH_AVX = -mmmx -msse2 -mavx -mno-avx2
+HARD_SWITCH_AVX2 = -mmmx -msse2 -mavx -mavx2
+HARD_SWITCH_AVX512 = -mmmx -msse2 -mavx -mavx2 -mavx512f
+ifeq "$(SUPPORTS_AVX512)" "True"
+       HARD_SWITCH_NOSIMD += -mno-avx512f
+       HARD_SWITCH_MMX += -mno-avx512f
+       HARD_SWITCH_SSE2 += -mno-avx512f
+       HARD_SWITCH_AVX += -mno-avx512f
+       HARD_SWITCH_AVX2 += -mno-avx512f
+       MULTIARCHOBJS +=  $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX512.o)
+endif
+                       

 BINS = proxmark3 flasher fpga_compress
 WINBINS = $(patsubst %, %.exe, $(BINS))
 BINS = proxmark3 flasher fpga_compress
 WINBINS = $(patsubst %, %.exe, $(BINS))

-CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(OBJDIR)/*.o *.moc.cpp ./ui/ui_overlays.h
+CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h

 
 

+# need to assign dependancies to build these first...

 all: lua_build $(BINS)
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
 
 proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS)
 all: lua_build $(BINS)
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
 
 proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS)

-proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUIOBJS) lualibs/usb_cmd.lua
-       $(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUIOBJS) $(LDLIBS) -o $@
+proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) lualibs/usb_cmd.lua
+       $(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) $(LDLIBS) -o $@

 
 flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
        $(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
        $(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@


@@ -179,10 +233,12 @@ flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
 fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
        $(LD) $(LDFLAGS) $(ZLIBFLAGS) $^ $(LDLIBS) -o $@
 
 fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
        $(LD) $(LDFLAGS) $(ZLIBFLAGS) $^ $(LDLIBS) -o $@
 

+proxgui.cpp: ui/ui_overlays.h
+

 proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^
 
 proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^
 

-ui/ui_overlays.h: ./ui/overlays.ui
+ui/ui_overlays.h: ui/overlays.ui

        $(UIC) $^ > $@
 
 lualibs/usb_cmd.lua: ../include/usb_cmd.h
        $(UIC) $^ > $@
 
 lualibs/usb_cmd.lua: ../include/usb_cmd.h


@@ -201,6 +257,24 @@ lua_build:
 
 .PHONY: all clean
 
 
 .PHONY: all clean
 

+$(OBJDIR)/%_NOSIMD.o : %.c $(OBJDIR)/%.d
+       $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_NOSIMD) -c -o $@ $<
+
+$(OBJDIR)/%_MMX.o : %.c $(OBJDIR)/%.d
+       $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_MMX) -c -o $@ $<
+
+$(OBJDIR)/%_SSE2.o : %.c $(OBJDIR)/%.d
+       $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_SSE2) -c -o $@ $<
+
+$(OBJDIR)/%_AVX.o : %.c $(OBJDIR)/%.d
+       $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_AVX) -c -o $@ $<
+
+$(OBJDIR)/%_AVX2.o : %.c $(OBJDIR)/%.d
+       $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_AVX2) -c -o $@ $<
+
+$(OBJDIR)/%_AVX512.o : %.c $(OBJDIR)/%.d
+       $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_AVX512) -c -o $@ $<
+

 %.o: %.c
 $(OBJDIR)/%.o : %.c $(OBJDIR)/%.d
        $(CC) $(DEPFLAGS) $(CFLAGS) $(ZLIBFLAGS) -c -o $@ $<
 %.o: %.c
 $(OBJDIR)/%.o : %.c $(OBJDIR)/%.d
        $(CC) $(DEPFLAGS) $(CFLAGS) $(ZLIBFLAGS) -c -o $@ $<


@@ -224,7 +298,7 @@ $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
 #      $(CXX) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $<
 #      $(POSTCOMPILE)
 
 #      $(CXX) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $<
 #      $(POSTCOMPILE)
 

-DEPENDENCY_FILES = $(patsubst %.c, $(OBJDIR)/%.d, $(CORESRCS) $(CMDSRCS) $(ZLIBSRCS)) \
+DEPENDENCY_FILES = $(patsubst %.c, $(OBJDIR)/%.d, $(CORESRCS) $(CMDSRCS) $(ZLIBSRCS) $(MULTIARCHSRCS)) \

        $(patsubst %.cpp, $(OBJDIR)/%.d, $(QTGUISRCS)) \
        $(OBJDIR)/proxmark3.d $(OBJDIR)/flash.d $(OBJDIR)/flasher.d $(OBJDIR)/fpga_compress.d
 
        $(patsubst %.cpp, $(OBJDIR)/%.d, $(QTGUISRCS)) \
        $(OBJDIR)/proxmark3.d $(OBJDIR)/flash.d $(OBJDIR)/flasher.d $(OBJDIR)/fpga_compress.d