From: Iceman <iceman@iuse.se>
Date: Sat, 8 Oct 2016 17:18:14 +0000 (+0200)
Subject: Merge pull request #119 from marshmellow42/pm3+reveng
X-Git-Tag: v3.0.0~76
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/d1057e7a2105d5e2696df185482176f22a5bd669?ds=sidebyside;hp=-c

Merge pull request #119 from marshmellow42/pm3+reveng

add reveng 1.30 source to PM3 for CRC calculations & searches
---

d1057e7a2105d5e2696df185482176f22a5bd669
diff --combined client/Makefile
index 6b8b84a3,5b604b11..8dd8ddef
--- a/client/Makefile
+++ b/client/Makefile
@@@ -37,7 -37,6 +37,7 @@@ els
      CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
      QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
      LUALIB +=  -ldl
 +    LDLIBS +=  -ltermcap -lncurses
      MOC = $(shell pkg-config --variable=moc_location QtCore)
      # Below is a variant you can use if you have problems compiling with QT5 on ubuntu. see http://www.proxmark.org/forum/viewtopic.php?id=1661 for more info. 
      #MOC = /usr/lib/x86_64-linux-gnu/qt4/bin/moc
@@@ -85,7 -84,7 +85,7 @@@ CMDSRCS = 	nonce2key/crapto1.c
  			cmdhflegic.c \
  			cmdhficlass.c \
  			cmdhfmf.c \
-             cmdhfmfu.c \
+ 			cmdhfmfu.c \
  			cmdhftopaz.c \
  			cmdhw.c \
  			cmdlf.c \
@@@ -100,8 -99,6 +100,8 @@@
  			cmdlft55xx.c \
  			cmdlfpcf7931.c\
  			cmdlfviking.c\
 +			cmdlfpresco.c\
 +			cmdlfpyramid.c\
  			pm3_binlib.c\
  			scripting.c\
  			cmdscript.c\
@@@ -109,6 -106,13 +109,13 @@@
  			aes.c\
  			protocols.c\
  			sha1.c\
+ 			cmdcrc.c\
+ 			reveng/reveng.c\
+ 			reveng/cli.c\
+ 			reveng/bmpbit.c\
+ 			reveng/model.c\
+ 			reveng/poly.c\
+ 			reveng/getopt.c\
  
  ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
  ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED