X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f89c705002842291e39d000f27dbaea1ddd78917..738eeccd9d120a05051905b1c4bb6ec29c81bbb8:/client/nonce2key/crypto1.c?ds=inline

diff --git a/client/nonce2key/crypto1.c b/client/nonce2key/crypto1.c
index fbf88898..77fb5fb0 100644
--- a/client/nonce2key/crypto1.c
+++ b/client/nonce2key/crypto1.c
@@ -1,21 +1,21 @@
 /*  crypto1.c
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301, US
-
-    Copyright (C) 2008-2008 bla <blapost@gmail.com>
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+	MA  02110-1301, US
+
+	Copyright (C) 2008-2008 bla <blapost@gmail.com>
 */
 #include "crapto1.h"
 #include <stdlib.h>
@@ -38,6 +38,7 @@ void crypto1_destroy(struct Crypto1State *state)
 {
 	free(state);
 }
+
 void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr)
 {
 	int i;
@@ -49,6 +50,7 @@ void crypto1_get_lfsr(struct Crypto1State *state, uint64_t *lfsr)
 uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
 {
 	uint32_t feedin;
+	uint32_t tmp;
 	uint8_t ret = filter(s->odd);
 
 	feedin  = ret & !!is_encrypted;
@@ -57,17 +59,30 @@ uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
 	feedin ^= LF_POLY_EVEN & s->even;
 	s->even = s->even << 1 | parity(feedin);
 
-	s->odd ^= (s->odd ^= s->even, s->even ^= s->odd);
+	tmp = s->odd;
+	s->odd = s->even;
+	s->even = tmp;
 
 	return ret;
 }
 uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted)
 {
+/*	
 	uint8_t i, ret = 0;
 
 	for (i = 0; i < 8; ++i)
 		ret |= crypto1_bit(s, BIT(in, i), is_encrypted) << i;
-
+*/
+	// unfold loop 20160112
+	uint8_t ret = 0;
+	ret |= crypto1_bit(s, BIT(in, 0), is_encrypted) << 0;
+	ret |= crypto1_bit(s, BIT(in, 1), is_encrypted) << 1;
+	ret |= crypto1_bit(s, BIT(in, 2), is_encrypted) << 2;
+	ret |= crypto1_bit(s, BIT(in, 3), is_encrypted) << 3;
+	ret |= crypto1_bit(s, BIT(in, 4), is_encrypted) << 4;
+	ret |= crypto1_bit(s, BIT(in, 5), is_encrypted) << 5;
+	ret |= crypto1_bit(s, BIT(in, 6), is_encrypted) << 6;
+	ret |= crypto1_bit(s, BIT(in, 7), is_encrypted) << 7;
 	return ret;
 }
 uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)