From: iceman <iceman@iuse.se>
Date: Tue, 9 Feb 2016 14:53:34 +0000 (+0100)
Subject: empty row..Merge branch 'master' of https://github.com/iceman1001/proxmark3
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/ef9b8b2c2b55254a70127e3730fd8e964c5b8521?hp=66afab80bdc78f26fecaa90f27fb2885dc3e9ef8

empty row..Merge branch 'master' of https://github.com/iceman1001/proxmark3

Conflicts:
	client/proxmark3.c
---

diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 07421ea1..eac783ff 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -686,8 +686,8 @@ static void Check_for_FilterFlipProperties(void)
 
 static void simulate_MFplus_RNG(uint32_t test_cuid, uint64_t test_key, uint32_t *nt_enc, uint8_t *par_enc)
 {
-	struct Crypto1State sim_cs;
-	sim_cs.odd = sim_cs.even = 0;
+	struct Crypto1State sim_cs = {0, 0};
+//	sim_cs.odd = sim_cs.even = 0;
 
 	// init cryptostate with key:
 	for(int8_t i = 47; i > 0; i -= 2) {