github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-24 15:05:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix nonce2key bug. fix debug_info array overflow bug.

Browse source
This commit is contained in:
douniwan5788 2016-04-24 15:16:34 +08:00
commit 3f43a10c37
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
armsrc/iso14443a.c
View file

@ -2058,7 +2058,7 @@ void ReaderMifare(bool first_try, uint8_t blockNo, uint8_t keyType)
byte_t par_list[8] = {0x00}; byte_t par_list[8] = {0x00};
byte_t ks_list[8] = {0x00}; byte_t ks_list[8] = {0x00};
#define PRNG_SEQUENCE_LENGTH (1 << 16); #define PRNG_SEQUENCE_LENGTH (1 << 16)
static uint32_t sync_time; static uint32_t sync_time;
static int32_t sync_cycles; static int32_t sync_cycles;
int catch_up_cycles = 0; int catch_up_cycles = 0;
@ -2195,12 +2195,16 @@ void ReaderMifare(bool first_try, uint8_t blockNo, uint8_t keyType)
isOK = -4; // Card's PRNG runs at an unexpected frequency or resets unexpectedly isOK = -4; // Card's PRNG runs at an unexpected frequency or resets unexpectedly
break; break;
} else { // continue for a while, just to collect some debug info } else { // continue for a while, just to collect some debug info
if (-1 != debug_info_nr)
{
debug_info[strategy][debug_info_nr] = nt_distance; debug_info[strategy][debug_info_nr] = nt_distance;
debug_info_nr++;
if (debug_info_nr == NUM_DEBUG_INFOS) { if (debug_info_nr == NUM_DEBUG_INFOS) {
strategy++; strategy++;
if (MF_DBGLEVEL >= 3) Dbprintf("strategy:%d", strategy);
debug_info_nr = 0; debug_info_nr = 0;
} }
}
debug_info_nr++;
continue; continue;
} }
} }
@ -2214,11 +2218,13 @@ void ReaderMifare(bool first_try, uint8_t blockNo, uint8_t keyType)
continue; continue;
} }
} }
if (MF_DBGLEVEL >= 3) Dbprintf("par: %d\n",par[0]);
if ((nt != nt_attacked) && nt_attacked) { // we somehow lost sync. Try to catch up again... if ((nt != nt_attacked) && nt_attacked) { // we somehow lost sync. Try to catch up again...
catch_up_cycles = -dist_nt(nt_attacked, nt); catch_up_cycles = -dist_nt(nt_attacked, nt);
if (catch_up_cycles == 99999) { // invalid nonce received. Don't resync on that one. if (catch_up_cycles == 99999) { // invalid nonce received. Don't resync on that one.
catch_up_cycles = 0; catch_up_cycles = 0;
if (MF_DBGLEVEL >= 3) Dbprintf("invalid nonce received. Don't resync on that one\n");
continue; continue;
} }
catch_up_cycles /= elapsed_prng_sequences; catch_up_cycles /= elapsed_prng_sequences;

2
client/nonce2key/nonce2key.c
View file

@ -52,7 +52,7 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
state = lfsr_common_prefix(nr, rr, ks3x, par, 0); state = lfsr_common_prefix(nr, rr, ks3x, par, 0);
state_s = 0; state_s = 0;
for (i = 0; (state) && ((state + i)->odd != -1 || (state + i)->even != ) && (i < 10); i++) for (i = 0; (state) && ((state + i)->odd != -1 || (state + i)->even != -1) && (i < 10); i++)
{ {
printf("%08x|%08x\n",(state+i)->odd, (state+i)->even); printf("%08x|%08x\n",(state+i)->odd, (state+i)->even);
state_s = state + i; state_s = state + i;