CHG: removed some debug statements, added another. Change the crapto1.c, lets...

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

diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c
index 3a902ac5229dac8d1547c14f5580b7d74778597b..ab97f5979dcb32d70855669b3d65adee638545f1 100644 (file)
--- a/client/nonce2key/nonce2key.c
+++ b/client/nonce2key/nonce2key.c
@@ -94,7 +94,6 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui
        
        state = lfsr_common_prefix_ex(nr, ks3x);
        state_s = (int64_t*)state;
        
        state = lfsr_common_prefix_ex(nr, ks3x);
        state_s = (int64_t*)state;

-       PrintAndLog("Prefix");

        
        for (i = 0; (state) && ((state + i)->odd != -1); i++) {
                lfsr_rollback_word(state + i, uid ^ nt, 0);
        
        for (i = 0; (state) && ((state + i)->odd != -1); i++) {
                lfsr_rollback_word(state + i, uid ^ nt, 0);


@@ -102,7 +101,6 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui
                *(state_s + i) = key_recovered;
        }
        
                *(state_s + i) = key_recovered;
        }
        

-       PrintAndLog("zero");

        if(!state)
                return 1;
        
        if(!state)
                return 1;
        


@@ -116,7 +114,6 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui
                p1 = p3 = last_keylist; 
                p2 = state_s;
                
                p1 = p3 = last_keylist; 
                p2 = state_s;
                

-               PrintAndLog("one");

                while ( *p1 != -1 && *p2 != -1 ) {
                        if (compar_int(p1, p2) == 0) {
                                printf("p1:%"llx" p2:%"llx" p3:%"llx" key:%012"llx"\n",(uint64_t)(p1-last_keylist),(uint64_t)(p2-state_s),(uint64_t)(p3-last_keylist),*p1);
                while ( *p1 != -1 && *p2 != -1 ) {
                        if (compar_int(p1, p2) == 0) {
                                printf("p1:%"llx" p2:%"llx" p3:%"llx" key:%012"llx"\n",(uint64_t)(p1-last_keylist),(uint64_t)(p2-state_s),(uint64_t)(p3-last_keylist),*p1);


@@ -128,9 +125,11 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui
                                while (compar_int(p1, p2) == 1) ++p2;
                        }
                }
                                while (compar_int(p1, p2) == 1) ++p2;
                        }
                }

-               key_count = p3 - last_keylist;;
+               key_count = p3 - last_keylist;
+               PrintAndLog("one A");

        } else {
                key_count = 0;
        } else {
                key_count = 0;

+               PrintAndLog("one B");

        }
 
        printf("key_count:%d\n", key_count);
        }
 
        printf("key_count:%d\n", key_count);


@@ -138,7 +137,6 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui
        // The list may still contain several key candidates. Test each of them with mfCheckKeys
        uint8_t keyBlock[6] = {0,0,0,0,0,0};
        uint64_t key64;
        // The list may still contain several key candidates. Test each of them with mfCheckKeys
        uint8_t keyBlock[6] = {0,0,0,0,0,0};
        uint64_t key64;

-       PrintAndLog("two");

        for (i = 0; i < key_count; i++) {
                key64 = *(last_keylist + i);
                num_to_bytes(key64, 6, keyBlock);
        for (i = 0; i < key_count; i++) {
                key64 = *(last_keylist + i);
                num_to_bytes(key64, 6, keyBlock);