github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 06:13:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 9d30a5f7c0 into 577b1c27f5

Browse source
This commit is contained in:
Tom Harkness 2018-07-17 22:35:05 +00:00 • committed by GitHub
commit 1a4d1f9a1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
armsrc/Makefile
View file

@ -10,7 +10,7 @@ APP_INCLUDES = apps.h
#remove one of the following defines and comment out the relevant line #remove one of the following defines and comment out the relevant line
#in the next section to remove that particular feature from compilation #in the next section to remove that particular feature from compilation
APP_CFLAGS = -DWITH_ISO14443a_StandAlone -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS -DWITH_LEGICRF -DWITH_HITAG -DWITH_CRC -DON_DEVICE -DWITH_HFSNOOP \ APP_CFLAGS = -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS -DWITH_LEGICRF -DWITH_HITAG -DWITH_CRC -DON_DEVICE -DWITH_HFSNOOP \
-fno-strict-aliasing -ffunction-sections -fdata-sections -fno-strict-aliasing -ffunction-sections -fdata-sections
#-DWITH_LCD #-DWITH_LCD
@ -118,4 +118,3 @@ help:
@echo Possible targets: @echo Possible targets:
@echo + all - Build the full image $(OBJDIR)/fullimage.s19 @echo + all - Build the full image $(OBJDIR)/fullimage.s19
@echo + clean - Clean $(OBJDIR) @echo + clean - Clean $(OBJDIR)

2
client/scripts/mfkeys.lua
View file

@ -68,7 +68,7 @@ function checkBlock(blockNo, keys, keyType)
data = data} data = data}
local status = checkCommand(command) local status = checkCommand(command)
if status then return status, blockNo end if status then return status, blockNo end
start = start+n+1 start = start+n --fixed base on pwpiwi's reccomendation
remaining = remaining - n remaining = remaining - n
end end
return nil return nil