CHG: change the number of calls to prng_successor was done. Fewer should mean faster :)

diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index 9bdaed29c6f8bdbfd9ac704928c7892b91fd7f7f..4d7ea3ed8a1a3019749850fc52ae1f809ecd2f43 100644 (file)
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -291,8 +291,8 @@ bool usb_check() {
 \r
 bool usb_poll()\r
 {\r
 \r
 bool usb_poll()\r
 {\r

-  if (!usb_check()) return false;\r
-  return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank);\r
+       if (!usb_check()) return false;\r
+       return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

diff --git a/tools/mfkey/mfkey32.c b/tools/mfkey/mfkey32.c
index c122b77b8ef5021d2c96a411fa19a19fd6eab55d..43e5a094dab57627c51705cb25b2b776b4321758 100755 (executable)
--- a/tools/mfkey/mfkey32.c
+++ b/tools/mfkey/mfkey32.c
@@ -43,17 +43,18 @@ int main (int argc, char *argv[]) {
 
        // Generate lfsr succesors of the tag challenge
        printf("\nLFSR succesors of the tag challenge:\n");
 
        // Generate lfsr succesors of the tag challenge
        printf("\nLFSR succesors of the tag challenge:\n");

-       printf("  nt': %08x\n",prng_successor(nt, 64));
-       printf(" nt'': %08x\n",prng_successor(nt, 96));
+       uint32_t p64 = prng_successor(nt, 64);
+       printf("  nt': %08x\n", p64);
+       printf(" nt'': %08x\n", prng_successor(p64, 32));

 
        clock_t t1 = clock();
                
        // Extract the keystream from the messages
        printf("\nKeystream used to generate {ar} and {at}:\n");
 
        clock_t t1 = clock();
                
        // Extract the keystream from the messages
        printf("\nKeystream used to generate {ar} and {at}:\n");

-       ks2 = ar0_enc ^ prng_successor(nt, 64);
-       printf("  ks2: %08x\n",ks2);
+       ks2 = ar0_enc ^ p64;
+       printf("  ks2: %08x\n", ks2);

 
 

-       s = lfsr_recovery32(ar0_enc ^ prng_successor(nt, 64), 0);
+       s = lfsr_recovery32(ar0_enc ^ p64, 0);

   
        for(t = s; t->odd | t->even; ++t) {
                lfsr_rollback_word(t, 0, 0);
   
        for(t = s; t->odd | t->even; ++t) {
                lfsr_rollback_word(t, 0, 0);


@@ -62,7 +63,7 @@ int main (int argc, char *argv[]) {
                crypto1_get_lfsr(t, &key);
                crypto1_word(t, uid ^ nt, 0);
                crypto1_word(t, nr1_enc, 1);
                crypto1_get_lfsr(t, &key);
                crypto1_word(t, uid ^ nt, 0);
                crypto1_word(t, nr1_enc, 1);

-               if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt, 64))) {
+               if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64)) {

                        printf("\nFound Key: [%012"llx"]\n\n",key);
                        break;}
        }
                        printf("\nFound Key: [%012"llx"]\n\n",key);
                        break;}
        }

diff --git a/tools/mfkey/mfkey32v2.c b/tools/mfkey/mfkey32v2.c
index 349b31e753bcfe68e90930e44f6db39289408c7d..92ac371fa383b20068991a25fdc1d95a0d23100d 100644 (file)
--- a/tools/mfkey/mfkey32v2.c
+++ b/tools/mfkey/mfkey32v2.c
@@ -47,16 +47,20 @@ int main (int argc, char *argv[]) {
 
        // Generate lfsr succesors of the tag challenge
        printf("\nLFSR succesors of the tag challenge:\n");
 
        // Generate lfsr succesors of the tag challenge
        printf("\nLFSR succesors of the tag challenge:\n");

-       printf("  nt': %08x\n",prng_successor(nt0, 64));
-       printf(" nt'': %08x\n",prng_successor(nt0, 96));
+       uint32_t p64 = prng_successor(nt0, 64);
+       uint32_t p64b = prng_successor(nt1, 64);
+       
+       printf("  nt': %08x\n", p64);
+       printf(" nt'': %08x\n", prng_successor(p64, 32));

        clock_t t1 = clock();
 
        // Extract the keystream from the messages
        printf("\nKeystream used to generate {ar} and {at}:\n");
        clock_t t1 = clock();
 
        // Extract the keystream from the messages
        printf("\nKeystream used to generate {ar} and {at}:\n");

-       ks2 = ar0_enc ^ prng_successor(nt0, 64);
+       ks2 = ar0_enc ^ p64;

        printf("  ks2: %08x\n",ks2);
 
        printf("  ks2: %08x\n",ks2);
 

-       s = lfsr_recovery32(ar0_enc ^ prng_successor(nt0, 64), 0);
+       s = lfsr_recovery32(ar0_enc ^ p64, 0);
+       

   
        for(t = s; t->odd | t->even; ++t) {
                lfsr_rollback_word(t, 0, 0);
   
        for(t = s; t->odd | t->even; ++t) {
                lfsr_rollback_word(t, 0, 0);


@@ -66,7 +70,7 @@ int main (int argc, char *argv[]) {
                
                crypto1_word(t, uid ^ nt1, 0);
                crypto1_word(t, nr1_enc, 1);
                
                crypto1_word(t, uid ^ nt1, 0);
                crypto1_word(t, nr1_enc, 1);

-               if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt1, 64))) {
+               if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64b)) {

                        printf("\nFound Key: [%012"llx"]\n\n",key);
                        break;}
        }
                        printf("\nFound Key: [%012"llx"]\n\n",key);
                        break;}
        }