PCF7931: Print found single/consecutive block(s), fixes to block 1 check

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index bf884f1f14614628c6f613df212dfa93b02a0b28..2b5e9ae6b2d48f4fc3bf43152e4bf9d680483c52 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -23,21 +23,39 @@ 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)
-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 -I$(JANSSONLIBPATH) -I$(MBEDTLSLIBPATH) -Wall -g -O3
+CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE $(INCLUDES_CLIENT) -Wall -g -O3
 CXXFLAGS = -I../include -Wall -O3
 
 APP_CFLAGS =
 include ../common/Makefile_Enabled_Options.common
 CFLAGS += $(APP_CFLAGS)
 ifneq (,$(findstring WITH_SMARTCARD,$(APP_CFLAGS)))
-       SRC_SMARTCARD = cmdsmartcard.c
+       SRC_SMARTCARD = cmdsmartcard.c pcsc.c
 else
        SRC_SMARTCARD = 
 endif
 
-LUAPLATFORM = generic
 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)))
                LUAPLATFORM = mingw
 else
@@ -107,20 +125,26 @@ CORESRCS =        uart_posix.c \
 CMDSRCS =      $(SRC_SMARTCARD) \
                        crapto1/crapto1.c\
                        crapto1/crypto1.c\
-                       polarssl/des.c\
                        crypto/libpcrypto.c\
                        crypto/asn1utils.c\
+                       crypto/asn1dump.c\
                        cliparser/argtable3.c\
                        cliparser/cliparser.c\
-                       mfkey.c\
+                       fido/additional_ca.c \
+                       fido/cose.c \
+                       fido/cbortools.c \
+                       fido/fidocore.c \
+                       mifare/mfkey.c \
                        loclass/cipher.c \
                        loclass/cipherutils.c \
                        loclass/ikeys.c \
                        loclass/elite_crack.c\
                        loclass/fileutils.c\
                        whereami.c\
-                       mifarehost.c\
-                       mifare4.c\
+                       mifare/mifarehost.c\
+                       mifare/mifare4.c\
+                       mifare/mad.c \
+                       mifare/ndef.c \
                        parity.c\
                        crc.c \
                        crc16.c \
@@ -148,6 +172,7 @@ CMDSRCS =   $(SRC_SMARTCARD) \
                        emv/test/dda_test.c\
                        emv/test/cda_test.c\
                        emv/cmdemv.c\
+                       emv/emv_roca.c \
                        cmdhf.c \
                        cmdhflist.c \
                        cmdhf14a.c \
@@ -195,7 +220,8 @@ CMDSRCS =   $(SRC_SMARTCARD) \
                        cmdscript.c\
                        pm3_binlib.c\
                        pm3_bitlib.c\
-                       protocols.c
+                       protocols.c\
+                       taginfo.c
 
 cpu_arch = $(shell uname -m)
 ifneq ($(findstring 86, $(cpu_arch)), )
@@ -242,15 +268,15 @@ endif
                        
 BINS = proxmark3 flasher fpga_compress
 WINBINS = $(patsubst %, %.exe, $(BINS))
-CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(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...
-all: lua_build jansson_build mbedtls_build $(BINS)
+all: lua_build jansson_build mbedtls_build cbor_build $(BINS)
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
 
-proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(MBEDTLSLIB) $(QTLDLIBS)
+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 $@
 
@@ -274,8 +300,9 @@ lualibs/usb_cmd.lua: ../include/usb_cmd.h
 clean:
        $(RM) $(CLEAN)
        cd ../liblua && make clean
-       cd ./jansson && 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/%)
@@ -286,12 +313,16 @@ lua_build:
        
 jansson_build:
        @echo Compiling jansson
-       cd ./jansson && make all
+       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
@@ -314,7 +345,7 @@ $(OBJDIR)/%_AVX512.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