From b0c76dd2cfd63d8a632637166a16f5f0e31a5563 Mon Sep 17 00:00:00 2001 From: Drewgoo Date: Tue, 28 Apr 2015 22:47:49 -0600 Subject: [PATCH 1/2] Update README.txt typo --- README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.txt b/README.txt index cb2c7f3c..1a4ddb6d 100644 --- a/README.txt +++ b/README.txt @@ -40,7 +40,7 @@ your operating system. Please refer to the Wiki for details. OBTAINING HARDWARE: -The Proxmark 3 is available for purcahse (assembled and tested) from the +The Proxmark 3 is available for purchase (assembled and tested) from the following locations: * http://proxmark3.com/ From 4b36037948fb7f0de45ac1033e6da335810c4993 Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Sun, 3 May 2015 22:09:52 +0200 Subject: [PATCH 2/2] Fixes to issue #100 --- client/cmdhf14a.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index 200c9dcd..d4285eea 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -177,8 +177,8 @@ int CmdHF14AReader(const char *Cmd) SendCommand(&c); WaitForResponse(CMD_ACK,&resp); - uint8_t version[8] = {0,0,0,0,0,0,0,0}; - memcpy(&version, resp.d.asBytes, resp.arg[0]); + uint8_t version[10] = {0}; + memcpy(version, resp.d.asBytes, resp.arg[0] < sizeof(version) ? resp.arg[0] : sizeof(version)); uint8_t len = resp.arg[0] & 0xff; switch ( len ){ // todo, identify "Magic UL-C tags". // they usually have a static nonce response to 0x1A command. @@ -221,7 +221,7 @@ int CmdHF14AReader(const char *Cmd) SendCommand(&c); WaitForResponse(CMD_ACK,&resp); - memcpy(&card.ats, resp.d.asBytes, resp.arg[0]); + memcpy(card.ats, resp.d.asBytes, resp.arg[0]); card.ats_len = resp.arg[0]; // note: ats_len includes CRC Bytes }