Fix util.c:116:2: error: unknown type name ‘va_list’ (#722)

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index d223a9219b2beb2017bde0665d3b7a70a88afa69..5ed4ea49eb24a571206ec1ccf00d522775b2ef1f 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -21,8 +21,10 @@ 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
 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 -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
 CXXFLAGS = -I../include -Wall -O3
 
 APP_CFLAGS =
@@ -37,10 +39,12 @@ endif
 LUAPLATFORM = generic
 platform = $(shell uname)
 ifneq (,$(findstring MINGW,$(platform)))
-    LUAPLATFORM = mingw
+               LUAPLATFORM = mingw
 else
        ifeq ($(platform),Darwin)
                LUAPLATFORM = macosx
+               OBJCSRCS = util_darwin.m
+               LDFLAGS += -framework Foundation -framework AppKit
        else
                LUALIB +=  -ldl
                LDLIBS +=  -ltermcap -lncurses
@@ -103,13 +107,12 @@ 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\
+                       fido/additional_ca.c \
                        mfkey.c\
                        loclass/cipher.c \
                        loclass/cipherutils.c \
@@ -118,6 +121,7 @@ CMDSRCS =   $(SRC_SMARTCARD) \
                        loclass/fileutils.c\
                        whereami.c\
                        mifarehost.c\
+                       mifare4.c\
                        parity.c\
                        crc.c \
                        crc16.c \
@@ -138,6 +142,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\
@@ -153,10 +158,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 \
@@ -164,6 +171,8 @@ CMDSRCS =   $(SRC_SMARTCARD) \
                        cmdlfem4x.c \
                        cmdlffdx.c \
                        cmdlfgproxii.c \
+                       hidcardformatutils.c\
+                       hidcardformats.c\
                        cmdlfhid.c \
                        cmdlfhitag.c \
                        cmdlfio.c \
@@ -208,6 +217,7 @@ QTGUISRCS = proxgui.cpp proxguiqt.cpp proxguiqt.moc.cpp guidummy.cpp
 
 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) \
@@ -233,19 +243,19 @@ endif
                        
 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
 
 # need to assign dependancies to build these first...
-all: lua_build jansson_build $(BINS)
+all: lua_build jansson_build mbedtls_build $(BINS)
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
 
-proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(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) $(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 $@
 
-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)
@@ -266,6 +276,7 @@ clean:
        $(RM) $(CLEAN)
        cd ../liblua && make clean
        cd ./jansson && make clean
+       cd $(MBEDTLSLIBPATH) && make clean
 
 tarbin: $(BINS)
        $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%) $(WINBINS:%=client/%)
@@ -277,6 +288,10 @@ lua_build:
 jansson_build:
        @echo Compiling jansson
        cd ./jansson && make all
+       
+mbedtls_build:
+       @echo Compiling mbedtls
+       cd $(MBEDTLSLIBPATH) && make all
 
 .PHONY: all clean
 
@@ -308,6 +323,10 @@ $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
        $(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 $@ $<
@@ -323,6 +342,7 @@ $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
 
 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): ;