dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/iceman1001/proxmark3

Browse Source 
Conflicts:
	armsrc/crypto1.c
This commit is contained in:
iceman1001
2016-02-16 21:43:45 +01:00
parent ee97a92adb 3989d6fff6
commit 7504dc50d5
7 changed files with 115 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/mfkey/Makefile
View File

@@ -5,7 +5,8 @@ LDFLAGS =
OBJS = crapto1.o crypto1.o
HEADERS = crapto1.h
EXES = mfkey64 mfkey64.exe mfkey32 mfkey32.exe mfkey32v2 mfkey32v2.exe
EXES = mfkey64 mfkey32 mfkey32v2
WINEXE = mfkey64.exe mfkey32.exe mfkey32v2.exe
LIBS =
all: $(OBJS) $(EXES) $(LIBS)
@@ -14,4 +15,5 @@ all: $(OBJS) $(EXES) $(LIBS)
$(LD) $(CFLAGS) -o $@ $< $(OBJS) $(LDFLAGS)
clean:
rm -f $(OBJS) $(EXES) $(LIBS)
rm -f $(OBJS) $(EXES) $(LIBS) $(WINEXE)

5
tools/nonce2key/Makefile
View File

@@ -5,7 +5,8 @@ LDFLAGS =
OBJS = crypto1.o crapto1.o
HEADERS = crapto1.h
EXES = nonce2key nonce2key.exe
EXES = nonce2key
WINEXES = nonce2key.exe
all: $(OBJS) $(EXES)
@@ -16,4 +17,4 @@ all: $(OBJS) $(EXES)
$(LD) $(LDFLAGS) -o $@ $(OBJS) $<
clean:
rm -f $(OBJS) $(EXES)
rm -f $(OBJS) $(EXES) $(WINEXES)