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

[proxmark3-svn] / client / nonce2key / crypto1.c

diff --git a/client/nonce2key/crypto1.c b/client/nonce2key/crypto1.c
index e5a3fe73dc59ff2e8f53dee2d8a6273d2b8a6b96..ba297b8df262a7ff2510b73dd5e8e6b332a74296 100644 (file)
--- a/client/nonce2key/crypto1.c
+++ b/client/nonce2key/crypto1.c
@@ -23,10 +23,11 @@
 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));

-       s->odd = s->even = 0;   
+       if ( !s ) return NULL;
+               

        int i;
        int i;

-
-       for(i = 47;s && i > 0; i -= 2) {
+       //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);
        }