FIX: Better legic annotation, show which byte was targeted during read and write...

[proxmark3-svn] / common / legic_prng.c

diff --git a/common/legic_prng.c b/common/legic_prng.c
index 322429ad716266924d72507ce02c248ac654dd38..93229251124563174032c946d693059b3a735ce9 100644 (file)
--- a/common/legic_prng.c
+++ b/common/legic_prng.c
@@ -6,36 +6,36 @@
 // LEFIC's obfuscation function
 //-----------------------------------------------------------------------------
 
 // LEFIC's obfuscation function
 //-----------------------------------------------------------------------------
 

-#include "../include/legic_prng.h"
+#include "legic_prng.h"

 
 struct lfsr {
 
 struct lfsr {

-  uint8_t  a;
-  uint8_t  b;
-  uint32_t c;
+       uint8_t  a;
+       uint8_t  b;
+       uint32_t c;

 } lfsr;
 
 void legic_prng_init(uint8_t init) {
 } lfsr;
 
 void legic_prng_init(uint8_t init) {

-  lfsr.c = 0;
-  lfsr.a = init;
-  if(init == 0) /* hack to get a always 0 keystream */
-    lfsr.b = 0;
-  else
-    lfsr.b = (init << 1) | 1;
+       lfsr.a = init;
+       lfsr.b = 0;  // hack to get a always 0 keystream 
+       lfsr.c = 0;
+       if(init)
+               lfsr.b = (init << 1) | 1;

 }
 
 void legic_prng_forward(int count) {
 }
 
 void legic_prng_forward(int count) {

-  lfsr.c += count;
-  while(count--) {
-    lfsr.a = lfsr.a >> 1 | (lfsr.a ^ lfsr.a >> 6) << 6;
-    lfsr.b = lfsr.b >> 1 | (lfsr.b ^ lfsr.b >> 2 ^ lfsr.b >> 3 ^ lfsr.b >> 7) << 7;
-  }
+       lfsr.c += count;
+       while(count--) {
+               // According: http://www.proxmark.org/forum/viewtopic.php?pid=5437#p5437
+               lfsr.a = (lfsr.a >> 1 | (lfsr.a ^ lfsr.a >> 6) << 6) & 0x7F;
+               lfsr.b = lfsr.b >> 1 | (lfsr.b ^ lfsr.b >> 2 ^ lfsr.b >> 3 ^ lfsr.b >> 7) << 7;
+       }

 }
 
 }
 

-int legic_prng_count() {
-  return lfsr.c;
+uint32_t legic_prng_count() {
+       return lfsr.c;

 }
 
 uint8_t legic_prng_get_bit() {
 }
 
 uint8_t legic_prng_get_bit() {

-  uint8_t idx = 7 - ( (lfsr.a & 4) | (lfsr.a >> 2 & 2) | (lfsr.a >> 4 & 1) );
-  return lfsr.b >> idx & 1;
-}
+       uint8_t idx = 7 - ( (lfsr.a & 4) | (lfsr.a >> 2 & 2) | (lfsr.a >> 4 & 1) );
+       return lfsr.b >> idx & 1;
+}
\ No newline at end of file