]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
Merge pull request #251 from marshmellow42/master
authorIceman <iceman@iuse.se>
Sun, 26 Mar 2017 12:35:42 +0000 (14:35 +0200)
committerGitHub <noreply@github.com>
Sun, 26 Mar 2017 12:35:42 +0000 (14:35 +0200)
split fdx-b demod to its own file

1  2 
client/Makefile

diff --combined client/Makefile
index 36d0c994c2c6588d8286686882c53af8ee3fceaf,4bac1ac92adc22d57503b545200a4ced69b4e37b..d5bfb08668113971abe22bcc4084f3d9cedbbaa0
@@@ -58,7 -58,7 +58,7 @@@ CORESRCS =    uart.c 
  
  CMDSRCS =     crapto1/crapto1.c\
                        crapto1/crypto1.c\
 -                      nonce2key.c\
 +                      mfkey.c\
                        loclass/cipher.c \
                        loclass/cipherutils.c \
                        loclass/des.c \
@@@ -67,7 -67,6 +67,7 @@@
                        loclass/fileutils.c\
                        whereami.c\
                        mifarehost.c\
 +                      parity.c\
                        crc.c \
                        crc16.c \
                        crc64.c \
@@@ -93,6 -92,7 +93,7 @@@
                        cmdlfawid.c \
                        cmdlfcotag.c\
                        cmdlfem4x.c \
+                       cmdlffdx.c \
                        cmdlfgproxii.c \
                        cmdlfhid.c \
                        cmdlfhitag.c \
Impressum, Datenschutz