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

diff --combined client/cmdhfmfhard.c
index 2c1ed7c429498634e5ed7c0e5b4d4f607d699930,07421ea19b3bbb2ac14feeec6c981f476e3b019c..eac783ff3903a6adcebf5fe88ec7348c234f9694
--- 1/client/cmdhfmfhard.c
--- 2/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) {