Add smartcard protocol T=0 (RRG repository PRs 71,72,74,75 by @merlokk) (#757)

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 9e5bde308b6896444b0fa15ad813d16e6ba116da..9ad8efdd6e906bae3ab5f986b3cdc0c12761ed7c 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -21,8 +21,14 @@ 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)
-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) -Wall -g -O3
+CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE $(INCLUDES_CLIENT) -Wall -g -O3
 CXXFLAGS = -I../include -Wall -O3
 
 APP_CFLAGS =
@@ -105,14 +111,16 @@ CORESRCS =        uart_posix.c \
 CMDSRCS =      $(SRC_SMARTCARD) \
                        crapto1/crapto1.c\
                        crapto1/crypto1.c\
-                       polarssl/des.c \
-                       polarssl/aes.c\
-                       polarssl/bignum.c\
-                       polarssl/rsa.c\
-                       polarssl/sha1.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 \
+                       mfkey.c \
                        loclass/cipher.c \
                        loclass/cipherutils.c \
                        loclass/ikeys.c \
@@ -120,6 +128,7 @@ CMDSRCS =   $(SRC_SMARTCARD) \
                        loclass/fileutils.c\
                        whereami.c\
                        mifarehost.c\
+                       mifare4.c\
                        parity.c\
                        crc.c \
                        crc16.c \
@@ -140,6 +149,7 @@ CMDSRCS =   $(SRC_SMARTCARD) \
                        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\
@@ -155,10 +165,12 @@ CMDSRCS =         $(SRC_SMARTCARD) \
                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
+                       cmdhfmfp.c \
                        cmdhfmfu.c \
                        cmdhfmfhard.c \
                        hardnested/hardnested_bruteforce.c \
                        cmdhftopaz.c \
+                       cmdhffido.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdlfawid.c \
@@ -241,12 +253,12 @@ WINBINS = $(patsubst %, %.exe, $(BINS))
 CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h
 
 # need to assign dependancies to build these first...
-all: lua_build jansson_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) $(QTLDLIBS)
+proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(MBEDTLSLIB) $(CBORLIB) $(QTLDLIBS)
 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 $@
 
@@ -270,7 +282,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/%)
@@ -282,7 +296,15 @@ lua_build:
 jansson_build:
        @echo Compiling jansson
        cd ./jansson && 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