emv/sc fixes and modifications: (#780)

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 52a106bd454d9ebe55f08e9d5939ae53cd97f2a1..aafbe3751ad887c5834d3d37bb1c326e90d3c1cc 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -19,17 +19,50 @@ OBJDIR = obj
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a

+JANSSONLIBPATH = ./jansson
+JANSSONLIB = $(JANSSONLIBPATH)/libjansson.a
+MBEDTLSLIBPATH = ../common/mbedtls
+MBEDTLSLIB = $(MBEDTLSLIBPATH)/libmbedtls.a
+CBORLIBPATH = ./tinycbor
+CBORLIB = $(CBORLIBPATH)/tinycbor.a
+LIBINCLUDES = -I../zlib -I../uart -I../liblua -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH)
+INCLUDES_CLIENT = -I. -I../include -I../common -I/opt/local/include $(LIBINCLUDES)

 LDFLAGS = $(ENV_LDFLAGS)
 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
+CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE $(INCLUDES_CLIENT) -Wall -g -O3

 CXXFLAGS = -I../include -Wall -O3
 
 CXXFLAGS = -I../include -Wall -O3
 

-LUAPLATFORM = generic
+APP_CFLAGS =
+include ../common/Makefile_Enabled_Options.common
+CFLAGS += $(APP_CFLAGS)
+ifneq (,$(findstring WITH_SMARTCARD,$(APP_CFLAGS)))
+       SRC_SMARTCARD = cmdsmartcard.c pcsc.c
+else
+       SRC_SMARTCARD = 
+endif
+

 platform = $(shell uname)
 platform = $(shell uname)

+
+ifneq (,$(findstring MINGW,$(platform)))
+       PCSC_INCLUDES :=
+       PCSC_LIBS = -lwinscard
+else
+       ifeq ($(platform),Darwin)
+               PCSC_INCLUDES = 
+               PCSC_LIBS = -framework PCSC
+       else
+               PCSC_INCLUDES := $(shell pkg-config --cflags libpcsclite)
+               PCSC_LIBS := $(shell pkg-config --libs libpcsclite)
+       endif
+endif
+
+LUAPLATFORM = generic

 ifneq (,$(findstring MINGW,$(platform)))
 ifneq (,$(findstring MINGW,$(platform)))

-    LUAPLATFORM = mingw
+               LUAPLATFORM = mingw

 else
        ifeq ($(platform),Darwin)
                LUAPLATFORM = macosx
 else
        ifeq ($(platform),Darwin)
                LUAPLATFORM = macosx

+               OBJCSRCS = util_darwin.m
+               LDFLAGS += -framework Foundation -framework AppKit

        else
                LUALIB +=  -ldl
                LDLIBS +=  -ltermcap -lncurses
        else
                LUALIB +=  -ldl
                LDLIBS +=  -ltermcap -lncurses


@@ -37,32 +70,34 @@ else
        endif
 endif
 
        endif
 endif
 

-# 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
+ifneq (,$(findstring WITH_GUI,$(APP_CFLAGS)))
+       # 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

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

        endif
 endif
 
        endif
 endif
 


@@ -79,19 +114,27 @@ 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_posix.c \
                        uart_win32.c \
                        util.c \
 CORESRCS =     uart_posix.c \
                        uart_win32.c \
                        util.c \

-                       util_posix.c
+                       util_posix.c \
+                       ui.c \
+                       comms.c

 
 

-CMDSRCS =      crapto1/crapto1.c\
+CMDSRCS =      $(SRC_SMARTCARD) \
+                       crapto1/crapto1.c\

                        crapto1/crypto1.c\
                        crapto1/crypto1.c\

-                       polarssl/des.c \
-                       polarssl/aes.c\
-                       polarssl/bignum.c\
-                       polarssl/rsa.c\
-                       polarssl/sha1.c\
-                       mfkey.c\
+                       crypto/libpcrypto.c\
+                       crypto/asn1utils.c\
+                       crypto/asn1dump.c\
+                       cliparser/argtable3.c\
+                       cliparser/cliparser.c\
+                       fido/additional_ca.c \
+                       fido/cose.c \
+                       fido/cbortools.c \
+                       fido/fidocore.c \
+                       mfkey.c \

                        loclass/cipher.c \
                        loclass/cipherutils.c \
                        loclass/ikeys.c \
                        loclass/cipher.c \
                        loclass/cipherutils.c \
                        loclass/ikeys.c \


@@ -99,15 +142,14 @@ CMDSRCS =  crapto1/crapto1.c\
                        loclass/fileutils.c\
                        whereami.c\
                        mifarehost.c\
                        loclass/fileutils.c\
                        whereami.c\
                        mifarehost.c\

+                       mifare4.c\

                        parity.c\
                        crc.c \
                        crc16.c \
                        crc64.c \
                        iso14443crc.c \
                        iso15693tools.c \
                        parity.c\
                        crc.c \
                        crc16.c \
                        crc64.c \
                        iso14443crc.c \
                        iso15693tools.c \

-                       data.c \

                        graph.c \
                        graph.c \

-                       ui.c \

                        cmddata.c \
                        lfdemod.c \
                        emv/crypto_polarssl.c\
                        cmddata.c \
                        lfdemod.c \
                        emv/crypto_polarssl.c\


@@ -121,13 +163,16 @@ CMDSRCS =         crapto1/crapto1.c\
                        emv/tlv.c\
                        emv/emv_tags.c\
                        emv/dol.c\
                        emv/tlv.c\
                        emv/emv_tags.c\
                        emv/dol.c\

+                       emv/emvjson.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\
                        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\

+                       emv/emv_roca.c \

                        cmdhf.c \
                        cmdhf.c \

+                       cmdhflist.c \

                        cmdhf14a.c \
                        cmdhf14b.c \
                        cmdhf15.c \
                        cmdhf14a.c \
                        cmdhf14b.c \
                        cmdhf15.c \


@@ -135,10 +180,12 @@ CMDSRCS =         crapto1/crapto1.c\
                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \

+                       cmdhfmfp.c \

                        cmdhfmfu.c \
                        cmdhfmfhard.c \
                        hardnested/hardnested_bruteforce.c \
                        cmdhftopaz.c \
                        cmdhfmfu.c \
                        cmdhfmfhard.c \
                        hardnested/hardnested_bruteforce.c \
                        cmdhftopaz.c \

+                       cmdhffido.c \

                        cmdhw.c \
                        cmdlf.c \
                        cmdlfawid.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdlfawid.c \


@@ -146,6 +193,8 @@ CMDSRCS =   crapto1/crapto1.c\
                        cmdlfem4x.c \
                        cmdlffdx.c \
                        cmdlfgproxii.c \
                        cmdlfem4x.c \
                        cmdlffdx.c \
                        cmdlfgproxii.c \

+                       hidcardformatutils.c\
+                       hidcardformats.c\

                        cmdlfhid.c \
                        cmdlfhitag.c \
                        cmdlfio.c \
                        cmdlfhid.c \
                        cmdlfhitag.c \
                        cmdlfio.c \


@@ -169,14 +218,7 @@ CMDSRCS =  crapto1/crapto1.c\
                        cmdscript.c\
                        pm3_binlib.c\
                        pm3_bitlib.c\
                        cmdscript.c\
                        pm3_binlib.c\
                        pm3_bitlib.c\

-                       protocols.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)), )
 
 cpu_arch = $(shell uname -m)
 ifneq ($(findstring 86, $(cpu_arch)), )


@@ -197,6 +239,7 @@ QTGUISRCS = proxgui.cpp proxguiqt.cpp proxguiqt.moc.cpp guidummy.cpp
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)

+OBJCOBJS = $(OBJCSRCS:%.m=$(OBJDIR)/%.o)

 ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)
 MULTIARCHOBJS = $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_NOSIMD.o) \
                        $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_MMX.o) \
 ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)
 MULTIARCHOBJS = $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_NOSIMD.o) \
                        $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_MMX.o) \


@@ -222,19 +265,19 @@ 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) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h
+CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h lualibs/usb_cmd.lua

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

-all: lua_build $(BINS)
+all: lua_build jansson_build mbedtls_build cbor_build $(BINS)

 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
 
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
 

-proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS)
-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 $@
+proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(MBEDTLSLIB) $(CBORLIB) $(QTLDLIBS) $(PCSC_LIBS)
+proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) lualibs/usb_cmd.lua
+       $(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) $(LDLIBS) -o $@

 
 

-flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
+flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS) $(OBJCOBJS)

        $(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
        $(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)


@@ -254,6 +297,9 @@ lualibs/usb_cmd.lua: ../include/usb_cmd.h
 clean:
        $(RM) $(CLEAN)
        cd ../liblua && make clean
 clean:
        $(RM) $(CLEAN)
        cd ../liblua && make clean

+       cd $(JANSSONLIBPATH) && make clean
+       cd $(MBEDTLSLIBPATH) && make clean
+       cd $(CBORLIBPATH) && make clean

 
 tarbin: $(BINS)
        $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%) $(WINBINS:%=client/%)
 
 tarbin: $(BINS)
        $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%) $(WINBINS:%=client/%)


@@ -261,7 +307,19 @@ tarbin: $(BINS)
 lua_build:
        @echo Compiling liblua, using platform $(LUAPLATFORM)
        cd ../liblua && make $(LUAPLATFORM)
 lua_build:
        @echo Compiling liblua, using platform $(LUAPLATFORM)
        cd ../liblua && make $(LUAPLATFORM)

-
+       
+jansson_build:
+       @echo Compiling jansson
+       cd $(JANSSONLIBPATH) && make all
+       
+mbedtls_build:
+       @echo Compiling mbedtls
+       cd $(MBEDTLSLIBPATH) && make all
+       
+cbor_build:
+       @echo Compiling tinycbor
+       cd $(CBORLIBPATH) && make all
+       

 .PHONY: all clean
 
 $(OBJDIR)/%_NOSIMD.o : %.c $(OBJDIR)/%.d
 .PHONY: all clean
 
 $(OBJDIR)/%_NOSIMD.o : %.c $(OBJDIR)/%.d


@@ -284,7 +342,7 @@ $(OBJDIR)/%_AVX512.o : %.c $(OBJDIR)/%.d
 
 %.o: %.c
 $(OBJDIR)/%.o : %.c $(OBJDIR)/%.d
 
 %.o: %.c
 $(OBJDIR)/%.o : %.c $(OBJDIR)/%.d

-       $(CC) $(DEPFLAGS) $(CFLAGS) $(ZLIBFLAGS) -c -o $@ $<
+       $(CC) $(DEPFLAGS) $(CFLAGS) $(ZLIBFLAGS) $(PCSC_INCLUDES) -c -o $@ $<

        $(POSTCOMPILE)
 
 %.o: %.cpp
        $(POSTCOMPILE)
 
 %.o: %.cpp


@@ -292,6 +350,10 @@ $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
        $(CXX) $(DEPFLAGS) $(CXXFLAGS) $(QTINCLUDES) -c -o $@ $<
        $(POSTCOMPILE)
 
        $(CXX) $(DEPFLAGS) $(CXXFLAGS) $(QTINCLUDES) -c -o $@ $<
        $(POSTCOMPILE)
 

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

 
 #$(CMDOBJS) $(COREOBJS): $(notdir $(%.c)) %.d
 #      $(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
 
 #$(CMDOBJS) $(COREOBJS): $(notdir $(%.c)) %.d
 #      $(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<


@@ -307,10 +369,10 @@ $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
 
 DEPENDENCY_FILES = $(patsubst %.c, $(OBJDIR)/%.d, $(CORESRCS) $(CMDSRCS) $(ZLIBSRCS) $(MULTIARCHSRCS)) \
        $(patsubst %.cpp, $(OBJDIR)/%.d, $(QTGUISRCS)) \
 
 DEPENDENCY_FILES = $(patsubst %.c, $(OBJDIR)/%.d, $(CORESRCS) $(CMDSRCS) $(ZLIBSRCS) $(MULTIARCHSRCS)) \
        $(patsubst %.cpp, $(OBJDIR)/%.d, $(QTGUISRCS)) \

+       $(patsubst %.m, $(OBJDIR)/%.d, $(OBJCSRCS)) \

        $(OBJDIR)/proxmark3.d $(OBJDIR)/flash.d $(OBJDIR)/flasher.d $(OBJDIR)/fpga_compress.d
 
 $(DEPENDENCY_FILES): ;
 .PRECIOUS: $(DEPENDENCY_FILES)
 
 -include $(DEPENDENCY_FILES)
        $(OBJDIR)/proxmark3.d $(OBJDIR)/flash.d $(OBJDIR)/flasher.d $(OBJDIR)/fpga_compress.d
 
 $(DEPENDENCY_FILES): ;
 .PRECIOUS: $(DEPENDENCY_FILES)
 
 -include $(DEPENDENCY_FILES)

-