CHG: Syncronized so all different parts uses the same implementation of Crapto1 v3.3

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

diff --git a/tools/mfkey/crypto1.c b/tools/mfkey/crypto1.c
index f45546055cb46d54dac201043ab4c6182110780c..d15a40e31b02224884c21713bf98282e3888fc7d 100755 (executable)
--- a/tools/mfkey/crypto1.c
+++ b/tools/mfkey/crypto1.c
@@ -69,7 +69,7 @@ uint8_t crypto1_byte(struct Crypto1State *s, uint8_t in, int is_encrypted)
        for (i = 0; i < 8; ++i)
                ret |= crypto1_bit(s, BIT(in, i), is_encrypted) << i;
        */
-       // unfold loop
+// unfold loop 20161012
        uint8_t ret = 0;
        ret |= crypto1_bit(s, BIT(in, 0), is_encrypted) << 0;
        ret |= crypto1_bit(s, BIT(in, 1), is_encrypted) << 1;
@@ -89,6 +89,7 @@ uint32_t crypto1_word(struct Crypto1State *s, uint32_t in, int is_encrypted)
        for (i = 0; i < 32; ++i)
                ret |= crypto1_bit(s, BEBIT(in, i), is_encrypted) << (i ^ 24);
 */
+//unfold loop 2016012
        uint32_t ret = 0;
        ret |= crypto1_bit(s, BEBIT(in, 0), is_encrypted) << (0 ^ 24);
        ret |= crypto1_bit(s, BEBIT(in, 1), is_encrypted) << (1 ^ 24);