github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-07-30 03:29:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source
This commit is contained in:
iceman1001 2015-04-08 21:24:08 +02:00
commit 5eae566a28
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -5,6 +5,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
## [Unreleased][unreleased] ## [Unreleased][unreleased]
### Changed ### Changed
- Iclass read, `hf iclass read` now also reads tag config and prints configuration. (holiman) - Iclass read, `hf iclass read` now also reads tag config and prints configuration. (holiman)
- *bootrom* needs to be flashed, due to new address boundaries between os and fpga, after a size optimization (piwi)
### Fixed ### Fixed
- Fixed issue #19, problems with LF T55xx commands (marshmellow) - Fixed issue #19, problems with LF T55xx commands (marshmellow)

3
armsrc/iclass.c
View file

@ -1676,7 +1676,8 @@ uint8_t handshakeIclassTag(uint8_t *card_data)
// Reader iClass Anticollission // Reader iClass Anticollission
void ReaderIClass(uint8_t arg0) { void ReaderIClass(uint8_t arg0) {
uint8_t card_data[6 * 8]={0xFF}; uint8_t card_data[6 * 8]={0};
memset(card_data, 0xFF, sizeof(card_data));
uint8_t last_csn[8]={0}; uint8_t last_csn[8]={0};
//Read conf block CRC(0x01) => 0xfa 0x22 //Read conf block CRC(0x01) => 0xfa 0x22