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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f3f84efe0886d40a659df9a6351649041e1c5ff..7ff77396b33905680045a63dd7df8fb8422b1b87 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 ## [Unreleased][unreleased]
 ### Changed
 - 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 issue #19, problems with LF T55xx commands (marshmellow)

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index e5bd4f42852ef1682962a48aedccb6be08cd7417..4d2f924c5f41e65e8e25f1971a41013e186e297e 100644 (file)
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -1676,7 +1676,8 @@ uint8_t handshakeIclassTag(uint8_t *card_data)
 // Reader iClass Anticollission
 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};
        
        //Read conf block CRC(0x01) => 0xfa 0x22