start merge

2018-10-24 18:18:05 +03:00
parent 0c78b8a69c
commit 61ea3109c9
12 changed files with 1015 additions and 129 deletions
--- a/client/Makefile
+++ b/client/Makefile
@@ -110,6 +110,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			polarssl/sha1.c \
 			polarssl/sha256.c \
 			polarssl/base64.c \
+			polarssl/libpcrypto.c \
 			cliparser/argtable3.c\
 			cliparser/cliparser.c\
 			loclass/cipher.c \
@@ -147,6 +148,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			emv/test/dda_test.c\
 			emv/test/cda_test.c\
 			emv/cmdemv.c \
+            mifare4.c \
 			cmdanalyse.c \
 			cmdhf.c \
 			cmdhflist.c \
@@ -158,6 +160,7 @@ CMDSRCS =	crapto1/crapto1.c \
 			cmdhficlass.c \
 			cmdhfmf.c \
            cmdhfmfu.c \
+            cmdhfmfp.c \
 			cmdhfmfhard.c \
            hardnested/hardnested_bruteforce.c \
 			cmdhfmfdes.c \