CHG: marshmellow42 's improved "hf mf sim x"

[proxmark3-svn] / tools / mfkey / crypto1.c

diff --git a/tools/mfkey/crypto1.c b/tools/mfkey/crypto1.c
index d15a40e31b02224884c21713bf98282e3888fc7d..f49a07225a1753d21bfebcb3b0b1ad65229cfd66 100755 (executable)
--- a/tools/mfkey/crypto1.c
+++ b/tools/mfkey/crypto1.c
@@ -23,9 +23,13 @@
 struct Crypto1State * crypto1_create(uint64_t key)
 {
        struct Crypto1State *s = malloc(sizeof(*s));
 struct Crypto1State * crypto1_create(uint64_t key)
 {
        struct Crypto1State *s = malloc(sizeof(*s));

-       int i;
+       if ( !s ) return NULL;

 
 

-       for(i = 47;s && i > 0; i -= 2) {
+       s->odd = s->even = 0;   
+       
+       int i;
+       //for(i = 47;s && i > 0; i -= 2) {
+       for(i = 47; i > 0; i -= 2) {

                s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
                s->even = s->even << 1 | BIT(key, i ^ 7);
        }
                s->odd  = s->odd  << 1 | BIT(key, (i - 1) ^ 7);
                s->even = s->even << 1 | BIT(key, i ^ 7);
        }