github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-14 01:03:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
marshmellow42 2015-05-03 23:31:58 -04:00
commit 63e1d35a07
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.txt
View file

@ -40,7 +40,7 @@ your operating system. Please refer to the Wiki for details.
OBTAINING HARDWARE: 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: following locations:
* http://proxmark3.com/ * http://proxmark3.com/

6
client/cmdhf14a.c
View file

@ -177,8 +177,8 @@ int CmdHF14AReader(const char *Cmd)
SendCommand(&c); SendCommand(&c);
WaitForResponse(CMD_ACK,&resp); WaitForResponse(CMD_ACK,&resp);
uint8_t version[8] = {0,0,0,0,0,0,0,0}; uint8_t version[10] = {0};
memcpy(&version, resp.d.asBytes, resp.arg[0]); memcpy(version, resp.d.asBytes, resp.arg[0] < sizeof(version) ? resp.arg[0] : sizeof(version));
uint8_t len = resp.arg[0] & 0xff; uint8_t len = resp.arg[0] & 0xff;
switch ( len ){ switch ( len ){
// todo, identify "Magic UL-C tags". // they usually have a static nonce response to 0x1A command. // 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); SendCommand(&c);
WaitForResponse(CMD_ACK,&resp); 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 card.ats_len = resp.arg[0]; // note: ats_len includes CRC Bytes
} }