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

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

Browse Source
This commit is contained in:
iceman1001
2020-05-11 15:00:09 +02:00
parent 11884df687 b377ca763a
commit d739edd13e
66 changed files with 360 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/deps/tinycbor/Makefile
View File

@@ -1,7 +1,7 @@
MYSRCPATHS =
MYINCLUDES =
# Strange errors on Mingw when compiling with C99
MYCFLAGS = -Wno-bad-function-cast -Wno-incompatible-pointer-types-discards-qualifiers
MYCFLAGS = -Wno-bad-function-cast -Wno-redundant-decls -Wno-incompatible-pointer-types-discards-qualifiers -Wno-discarded-qualifiers -Wno-unknown-warning-option -Wno-maybe-uninitialized
MYDEFS =
MYSRCS = \
cborencoder.c \
@@ -18,7 +18,4 @@ LIB_A = tinycbor.a
# Transition: remove old directories and objects
MYCLEANOLDPATH = ../../tinycbor
# Strange errors on Mingw when compiling with -O3
CFLAGS ?= -Wall -Werror -O2
include ../../../Makefile.host

2
client/src/cmdlft55xx.c
View File

@@ -2538,7 +2538,7 @@ bool AcquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password, u
}
char *GetPskCfStr(uint32_t id, bool q5) {
static char buf[25];
static char buf[40];
char *retStr = buf;
switch (id) {
case 0: