From 87a74e98b885c14100f3e606f63677ef773d395d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 16 Apr 2019 15:19:53 +0200
Subject: [PATCH] style

---
 common/crapto1/crapto1.c  |  7 +++----
 tools/nonce2key/crapto1.c | 20 ++++----------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/common/crapto1/crapto1.c b/common/crapto1/crapto1.c
index ea496e1c4..232afb4a0 100644
--- a/common/crapto1/crapto1.c
+++ b/common/crapto1/crapto1.c
@@ -85,13 +85,12 @@ static struct Crypto1State *
 recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
         uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
         struct Crypto1State *sl, uint32_t in, bucket_array_t bucket) {
-    uint32_t *o, *e;
     bucket_info_t bucket_info;
 
     if (rem == -1) {
-        for (e = e_head; e <= e_tail; ++e) {
+        for (uint32_t *e = e_head; e <= e_tail; ++e) {
             *e = *e << 1 ^ (evenparity32(*e & LF_POLY_EVEN)) ^ !!(in & 4);
-            for (o = o_head; o <= o_tail; ++o, ++sl) {
+            for (uint32_t *o = o_head; o <= o_tail; ++o, ++sl) {
                 sl->even = *o;
                 sl->odd = *e ^ (evenparity32(*o & LF_POLY_ODD));
                 sl[1].odd = sl[1].even = 0;
@@ -301,7 +300,7 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb) {
     out ^= LF_POLY_EVEN & (s->even >>= 1);
     out ^= LF_POLY_ODD & s->odd;
     out ^= !!in;
-    out ^= (ret = filter(s->odd)) & !!fb;
+    out ^= (ret = filter(s->odd)) & (!!fb);
 
     s->even |= (evenparity32(out)) << 23;
     return ret;
diff --git a/tools/nonce2key/crapto1.c b/tools/nonce2key/crapto1.c
index 9026a57bb..bc9165f0e 100644
--- a/tools/nonce2key/crapto1.c
+++ b/tools/nonce2key/crapto1.c
@@ -368,12 +368,6 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb) {
  * Rollback the shift register in order to get previous states
  */
 uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb) {
-    /*
-    int i, ret = 0;
-    for (i = 7; i >= 0; --i)
-        ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;
-    */
-// unfold loop 20160112
     uint8_t ret = 0;
     ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;
     ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;
@@ -389,13 +383,7 @@ uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb) {
  * Rollback the shift register in order to get previous states
  */
 uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb) {
-    /*
-    int i;
-    uint32_t ret = 0;
-    for (i = 31; i >= 0; --i)
-        ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);
-    */
-// unfold loop 20160112
+
     uint32_t ret = 0;
     ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);
     ret |= lfsr_rollback_bit(s, BEBIT(in, 30), fb) << (30 ^ 24);
@@ -442,7 +430,7 @@ static uint16_t *dist = 0;
 int nonce_distance(uint32_t from, uint32_t to) {
     uint16_t x, i;
     if (!dist) {
-        dist = malloc(2 << 16);
+        dist = calloc(2 << 16,  sizeof(uint8_t));
         if (!dist)
             return -1;
         for (x = i = 1; i; ++i) {
@@ -470,7 +458,7 @@ static uint32_t fastfwd[2][8] = {
  * only correct iff [NR_3] ^ NR_3 does not depend on Nr_3
  */
 uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd) {
-    uint32_t *candidates = malloc(4 << 10);
+    uint32_t *candidates = calloc(4 << 10, sizeof(uint8_t));
     if (!candidates) return 0;
 
     uint32_t c,  entry;
@@ -538,7 +526,7 @@ struct Crypto1State *lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8]
     odd = lfsr_prefix_ks(ks, 1);
     even = lfsr_prefix_ks(ks, 0);
 
-    s = statelist = malloc((sizeof * statelist) << 20);
+    s = statelist = malloc((sizeof * statelist) << 24); // was << 20. Need more for no_par special attack. Enough???
     if (!s || !odd || !even) {
         free(statelist);
         statelist = 0;