From: iceman <iceman@iuse.se>
Date: Tue, 12 Jan 2016 20:58:03 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/iceman1001/proxmark3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/63852b2f5121013884826145e8d2dd2d7dbcf36d?hp=-c

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

63852b2f5121013884826145e8d2dd2d7dbcf36d
diff --combined client/cmdhfmfhard.c
index 2c1ed7c4,07421ea1..eac783ff
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@@ -88,7 -88,7 +88,7 @@@ typedef struct noncelist 
  } noncelist_t;
  
  
- static uint32_t cuid;
+ static uint32_t cuid = 0;
  static noncelist_t nonces[256];
  static uint8_t best_first_bytes[256];
  static uint16_t first_byte_Sum = 0;
@@@ -686,8 -686,8 +686,8 @@@ static void Check_for_FilterFlipPropert
  
  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) {