X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/bf22fab73b6a969d761c8f0f259e5fc67a806f83..c08c796e8d11fc26af157545439c918c9603056a:/client/nonce2key/crypto1.c

diff --git a/client/nonce2key/crypto1.c b/client/nonce2key/crypto1.c
index e5a3fe73..268d55a0 100644
--- a/client/nonce2key/crypto1.c
+++ b/client/nonce2key/crypto1.c
@@ -23,10 +23,13 @@
 struct Crypto1State * crypto1_create(uint64_t key)
 {
 	struct Crypto1State *s = malloc(sizeof(*s));
-	s->odd = s->even = 0;	
-	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);
 	}