Implement Originality Signature Check in 'hf mfu info'

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 81b46f235a7e817ec88c9bde5dba6e9fc2f4cace..2b5e9ae6b2d48f4fc3bf43152e4bf9d680483c52 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -35,13 +35,27 @@ APP_CFLAGS =
 include ../common/Makefile_Enabled_Options.common
 CFLAGS += $(APP_CFLAGS)
 ifneq (,$(findstring WITH_SMARTCARD,$(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
 
 else
        SRC_SMARTCARD = 
 endif
 

-LUAPLATFORM = generic

 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)))
                LUAPLATFORM = mingw
 else
 ifneq (,$(findstring MINGW,$(platform)))
                LUAPLATFORM = mingw
 else


@@ -120,15 +134,17 @@ CMDSRCS =         $(SRC_SMARTCARD) \
                        fido/cose.c \
                        fido/cbortools.c \
                        fido/fidocore.c \
                        fido/cose.c \
                        fido/cbortools.c \
                        fido/fidocore.c \

-                       mfkey.c \
+                       mifare/mfkey.c \

                        loclass/cipher.c \
                        loclass/cipherutils.c \
                        loclass/ikeys.c \
                        loclass/elite_crack.c\
                        loclass/fileutils.c\
                        whereami.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 \
                        parity.c\
                        crc.c \
                        crc16.c \


@@ -204,7 +220,8 @@ CMDSRCS =   $(SRC_SMARTCARD) \
                        cmdscript.c\
                        pm3_binlib.c\
                        pm3_bitlib.c\
                        cmdscript.c\
                        pm3_binlib.c\
                        pm3_bitlib.c\

-                       protocols.c
+                       protocols.c\
+                       taginfo.c

 
 cpu_arch = $(shell uname -m)
 ifneq ($(findstring 86, $(cpu_arch)), )
 
 cpu_arch = $(shell uname -m)
 ifneq ($(findstring 86, $(cpu_arch)), )


@@ -259,7 +276,7 @@ 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) $(JANSSONLIB) $(MBEDTLSLIB) $(CBORLIB) $(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 $@
 
 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 $@
 


@@ -328,7 +345,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