tyler.durden/pixiewps
1
0
Fork 0
mirror of https://github.com/wiire-a/pixiewps.git synced 2025-07-28 08:14:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed wrong termination condition with mode 2

Browse Source
This commit is contained in:
wiire-a 2017-12-19 23:48:08 +01:00
parent 6e60c990f5
commit 57e3309cfe
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pixiewps.c
View File

@ -1108,17 +1108,17 @@ usage_err:
DEBUG_PRINT(" * Mode: %d (%s)", ECOS_SIMPLE, p_mode_name[ECOS_SIMPLE]); DEBUG_PRINT(" * Mode: %d (%s)", ECOS_SIMPLE, p_mode_name[ECOS_SIMPLE]);
uint32_t index = wps->e_nonce[0] << 25; /* Reducing entropy from 32 to 25 bits */ uint32_t known = wps->e_nonce[0] << 25; /* Reducing entropy from 32 to 25 bits */
do { uint32_t counter = 0;
seed = index; seed = 0;
uint_fast8_t i; while (counter < 0x02000000) {
int i;
seed = known | counter;
for (i = 1; i < WPS_NONCE_LEN; i++) { for (i = 1; i < WPS_NONCE_LEN; i++) {
if (wps->e_nonce[i] != (uint8_t)(ecos_rand_simple(&seed) & 0xff)) if (wps->e_nonce[i] != (uint8_t)(ecos_rand_simple(&seed) & 0xff))
break; break;
} }
if (i == WPS_NONCE_LEN) { /* Seed found */ if (i == WPS_NONCE_LEN) { /* Seed found */
wps->nonce_seed = index;
wps->s1_seed = seed; wps->s1_seed = seed;
for (i = 0; i < WPS_SECRET_NONCE_LEN; i++) /* Advance to get E-S1 */ for (i = 0; i < WPS_SECRET_NONCE_LEN; i++) /* Advance to get E-S1 */
wps->e_s1[i] = (uint8_t)(ecos_rand_simple(&seed) & 0xff); wps->e_s1[i] = (uint8_t)(ecos_rand_simple(&seed) & 0xff);
@ -1126,13 +1126,13 @@ usage_err:
for (i = 0; i < WPS_SECRET_NONCE_LEN; i++) /* Advance to get E-S2 */ for (i = 0; i < WPS_SECRET_NONCE_LEN; i++) /* Advance to get E-S2 */
wps->e_s2[i] = (uint8_t)(ecos_rand_simple(&seed) & 0xff); wps->e_s2[i] = (uint8_t)(ecos_rand_simple(&seed) & 0xff);
DEBUG_PRINT("Seed found (%10u)", wps->nonce_seed); DEBUG_PRINT("Seed found");
break; break;
} }
index++; counter++;
} while (!(index & 0x02000000)); }
if (wps->nonce_seed) { /* Seed found */ if (wps->s1_seed) { /* Seed found */
DEBUG_PRINT("Trying with E-S1: "); DEBUG_PRINT("Trying with E-S1: ");
DEBUG_PRINT_ARRAY(wps->e_s1, WPS_SECRET_NONCE_LEN); DEBUG_PRINT_ARRAY(wps->e_s1, WPS_SECRET_NONCE_LEN);
@ -1370,7 +1370,7 @@ usage_err:
} }
} }
else { else {
if (found_p_mode == RT && wps->nonce_seed == 0) if ((found_p_mode == RT && wps->nonce_seed == 0) || found_p_mode == ECOS_SIMPLE)
printf("\n [*] Seed N1: -"); printf("\n [*] Seed N1: -");
else else
printf("\n [*] Seed N1: 0x%08x", wps->nonce_seed); printf("\n [*] Seed N1: 0x%08x", wps->nonce_seed);