diff --git a/Makefile b/Makefile index 4d55d22b5..6cbdeaa43 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,27 @@ -include common/Makefile.common - +GZIP=gzip +# Windows' echo echos its input verbatim, on Posix there is some +# amount of shell command line parsing going on. echo "" on +# Windows yields literal "", on Linux yields an empty line +ifeq ($(shell echo ""),) +# This is probably a proper system, so we can use uname +DELETE=rm -rf +FLASH_TOOL=client/flasher +platform=$(shell uname) +ifneq (,$(findstring MINGW,$(platform))) +FLASH_PORT=com3 +PATHSEP=\\# +else FLASH_PORT=/dev/ttyACM0 +PATHSEP=/ +endif +else +# Assume that we are running on native Windows +DELETE=del /q +FLASH_TOOL=client/flasher.exe +platform=Windows +FLASH_PORT=com3 +PATHSEP=\\# +endif all clean: %: client/% bootrom/% armsrc/% recovery/% diff --git a/client/Makefile b/client/Makefile index f1082b2c5..de56e1bfc 100644 --- a/client/Makefile +++ b/client/Makefile @@ -3,96 +3,91 @@ # at your option, any later version. See the LICENSE.txt file for the text of # the license. #----------------------------------------------------------------------------- -include ../common/Makefile.common CC = gcc CXX = g++ -COMMON_FLAGS += -std=c99 -O3 -g +LD = g++ +TAR = tar +TARFLAGS = -C .. --ignore-failed-read -rvf +RM = rm -f +MV = mv -#VPATH = ../common ../zlib +#COMMON_FLAGS = -m32 +VPATH = ../common ../zlib ../uart OBJDIR = obj LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm LUALIB = ../liblua/liblua.a -#LDFLAGS = $(COMMON_FLAGS) -CFLAGS = $(COMMON_FLAGS) -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall +LDFLAGS = $(COMMON_FLAGS) +CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I../uart -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O3 +CXXFLAGS = -I../include -Wall -O3 + LUAPLATFORM = generic - +platform = $(shell uname) ifneq (,$(findstring MINGW,$(platform))) - LDLIBS += -L/mingw/lib -lgdi32 - CFLAGS += -I/mingw/include -D__USE_MINGW_ANSI_STDIO=1 -march=x86-64 - CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui - MOC = $(QTDIR)/bin/moc LUAPLATFORM = mingw - ifneq ($(wildcard $(QTDIR)/include/QtWidgets),) - CXXFLAGS += -I$(QTDIR)/include/QtWidgets - QTLDLIBS = -L$(QTDIR)/lib -lQt5Core -lQt5Gui -lQt5Widgets else - QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4 - endif - - # QT version, 4 or 5 - qtplatform = $(shell $(MOC) -v) - ifneq (, $(findstring moc 5,$(qtplatform))) - CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui -I$(QTDIR)/include/QtWidgets -I/mingw/include - QTLDLIBS = -L$(QTDIR)/lib -lQt5Core -lQt5Gui -lQt5Widgets - else - CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui - QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4 - endif - -else ifeq ($(platform),Darwin) - - # OS X, QT5 detection needs this. - export PKG_CONFIG_PATH=/usr/local/Cellar/qt5/5.6.1-1/lib/pkgconfig/ - - CFLAGS += -march=native - CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3 - QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) - MOC = $(shell pkg-config --variable=moc_location QtCore) - - # QT version, 4 or 5 - qtplatform = $(shell $(MOC) -v) - ifneq (, $(findstring moc 5,$(qtplatform))) - # use this if you have QT5 installed. - CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include -I/usr/local/opt/qt5/include - LDLIBS = -L/usr/local/opt/readline/lib -L/usr/local/opt/qt5/lib -lreadline -lpthread -lm - else - # Assuming you have QT4 installed. - CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include - LDLIBS = -L/usr/local/opt/readline/lib -lreadline -lpthread -lm - endif - + ifeq ($(platform),Darwin) LUAPLATFORM = macosx else - CFLAGS += -march=native - CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3 - QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) LUALIB += -ldl LDLIBS += -ltermcap -lncurses - MOC = $(shell pkg-config --variable=moc_location QtCore) - # Below is a variant you can use if you have problems compiling with QT5 on ubuntu. see http://www.proxmark.org/forum/viewtopic.php?id=1661 for more info. - #MOC = /usr/lib/x86_64-linux-gnu/qt4/bin/moc LUAPLATFORM = linux endif - -ifneq ($(QTLDLIBS),) - QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o - CFLAGS += -DHAVE_GUI - LINK.o = $(LINK.cpp) -else - QTGUI = guidummy.o endif -CORESRCS = uart.c \ - util.c \ - sleep.c +# Check for correctly configured Qt5 +QTINCLUDES = $(shell pkg-config --cflags Qt5Core Qt5Widgets 2>/dev/null) +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), ) +# 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) +else + CXXFLAGS += -std=c++11 -fPIC +endif +ifeq ($(QTINCLUDES), ) +# if both pkg-config commands failed, search in common places + ifneq ($(QTDIR), ) + QTINCLUDES = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui + QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4 + 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 +endif -CMDSRCS = mifarehost.c \ - nonce2key/crapto1.c \ - nonce2key/crypto1.c \ - nonce2key/nonce2key.c \ - nonce2key/crypto1_bs.c \ + +ifneq ($(QTLDLIBS),) + QTGUIOBJS = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o + CFLAGS += -DHAVE_GUI +else + QTGUIOBJS = $(OBJDIR)/guidummy.o +endif + +# Flags to generate temporary dependency files +DEPFLAGS = -MT $@ -MMD -MP -MF $(OBJDIR)/$*.Td +# make temporary to final dependeny files after successful compilation +POSTCOMPILE = $(MV) -f $(OBJDIR)/$*.Td $(OBJDIR)/$*.d + +CORESRCS = uart_posix.c \ + uart_win32.c \ + util.c \ + util_posix.c \ + scandir.c +# sleep.c + +CMDSRCS = crapto1/crapto1.c\ + crapto1/crypto1.c\ + mfkey.c\ loclass/cipher.c \ loclass/cipherutils.c \ loclass/des.c \ @@ -100,6 +95,7 @@ CMDSRCS = mifarehost.c \ loclass/elite_crack.c \ loclass/fileutils.c \ whereami.c \ + mifarehost.c\ parity.c \ crc.c \ crc16.c \ @@ -123,34 +119,35 @@ CMDSRCS = mifarehost.c \ cmdhfmf.c \ cmdhfmfu.c \ cmdhfmfhard.c \ + hardnested/hardnested_bruteforce.c \ cmdhfmfdes.c \ cmdhftopaz.c \ cmdhfemv.c \ cmdhw.c \ cmdlf.c \ - cmdlfio.c \ - cmdlfhid.c \ cmdlfawid.c \ + cmdlfcotag.c \ cmdlfem4x.c \ + cmdlffdx.c \ + cmdlfguard.c \ + cmdlfhid.c \ cmdlfhitag.c \ - cmdlfti.c \ - cmdparser.c \ - cmdmain.c \ - cmdlft55xx.c \ - cmdlfpcf7931.c \ - cmdlfviking.c \ + cmdlfio.c \ + cmdlfjablotron.c \ + cmdlfnexwatch.c \ + cmdlfnedap.c \ + cmdlfnoralsy.c \ cmdlfpac.c \ + cmdlfpcf7931.c \ cmdlfpresco.c \ cmdlfpyramid.c \ cmdlfsecurakey.c \ - cmdlfguard.c \ - cmdlfnexwatch.c \ - cmdlfnedap.c \ - cmdlfjablotron.c \ + cmdlft55xx.c \ + cmdlfti.c \ + cmdlfviking.c \ cmdlfvisa2000.c \ - cmdlfnoralsy.c \ - cmdlffdx.c \ - cmdlfcotag.c \ + cmdparser.c \ + cmdmain.c \ pm3_binlib.c \ scripting.c \ cmdscript.c \ @@ -172,59 +169,139 @@ CMDSRCS = mifarehost.c \ bucketsort.c # radixsort.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 64, $(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 -ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED +ZLIBFLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED #-DDEBUG -Dverbose=1 +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) +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) -RM = rm -f +GCC_GTEQ_490 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40900) +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 "$(GCC_GTEQ_490)" "1" + 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 -CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe fpga_compress fpga_compress.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp +WINBINS = $(patsubst %, %.exe, $(BINS)) +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: $(BINS) +all-static: proxmark3 flasher fpga_compress proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS) -proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI) - $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@ - -snooper: $(OBJDIR)/snooper.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o - $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@ - -cli: LDLIBS+=$(LUALIB) -cli: $(OBJDIR)/cli.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o - $(CXX) $(CXXFLAGS) -lpthread $^ $(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) - $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@ + $(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@ fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS) - $(CXX) $(CXXFLAGS) $(ZLIB_FLAGS) $^ $(LDLIBS) -o $@ + $(LD) $(LDFLAGS) $(ZLIBFLAGS) $^ $(LDLIBS) -o $@ -$(OBJDIR)/%.o: %.c - $(CC) $(CFLAGS) $(ZLIB_FLAGS) -c -o $@ $< - -$(OBJDIR)/%.o: %.cpp - $(CXX) $(CXXFLAGS) -c -o $@ $< +proxgui.cpp: ui/ui_overlays.h proxguiqt.moc.cpp: proxguiqt.h $(MOC) -o$@ $^ +ui/ui_overlays.h: ui/overlays.ui + $(UIC) $^ > $@ + +lualibs/usb_cmd.lua: ../include/usb_cmd.h + awk -f usb_cmd_h2lua.awk $^ > $@ + clean: $(RM) $(CLEAN) cd ../liblua && make clean tarbin: $(BINS) - $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%) + $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%) $(WINBINS:%=client/%) lua_build: @echo Compiling liblua, using platform $(LUAPLATFORM) cd ../liblua && make $(LUAPLATFORM) .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 $@ $< + $(POSTCOMPILE) + +%.o: %.cpp +$(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d + $(CXX) $(DEPFLAGS) $(CXXFLAGS) $(QTINCLUDES) -c -o $@ $< + $(POSTCOMPILE) + + +#$(CMDOBJS) $(COREOBJS): $(notdir $(%.c)) %.d +# $(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $< +# $(POSTCOMPILE) + +#$(ZLIBOBJS): $(notdir $(%.c)) %.d +# $(CC) $(DEPFLAGS) $(CFLAGS) $(ZLIBFLAGS) -c -o $@ $< +# $(POSTCOMPILE) + +#$(QTGUIOBJS): $(notdir $(%.cpp)) %.d +# $(CXX) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $< +# $(POSTCOMPILE) + +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 + +$(DEPENDENCY_FILES): ; +.PRECIOUS: $(DEPENDENCY_FILES) + +-include $(DEPENDENCY_FILES) +