tyler.durden/pixiewps
1
0
Fork 0
mirror of https://github.com/wiire-a/pixiewps.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed unnecessary check for Enrollee nonce

Browse Source
This commit is contained in:
wiire-a 2017-12-19 19:38:49 +01:00
parent fb139003e9
commit 86292d5f89
1 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/pixiewps.c
View File

@ -1340,49 +1340,45 @@ usage_err:
if (wps->verbosity > 1) { if (wps->verbosity > 1) {
printf("\n [?] Mode: %u (%s)", found_p_mode, p_mode_name[found_p_mode]); printf("\n [?] Mode: %u (%s)", found_p_mode, p_mode_name[found_p_mode]);
} }
if (wps->e_nonce) { if (wps->verbosity > 2) {
if (wps->verbosity > 2) { if (found_p_mode != NONE) {
if (found_p_mode != NONE) { if (found_p_mode == RTL819x) {
if (found_p_mode == RTL819x) { if (wps->nonce_seed) {
if (wps->nonce_seed) { time_t seed_time;
time_t seed_time; struct tm ts;
struct tm ts; char buffer[30];
char buffer[30];
printf("\n [*] Seed N1: %u", wps->nonce_seed); printf("\n [*] Seed N1: %u", wps->nonce_seed);
seed_time = wps->nonce_seed; seed_time = wps->nonce_seed;
ts = *gmtime(&seed_time); ts = *gmtime(&seed_time);
strftime(buffer, 30, "%c", &ts); strftime(buffer, 30, "%c", &ts);
printf(" (%s UTC)", buffer); printf(" (%s UTC)", buffer);
printf("\n [*] Seed ES1: %u", wps->s1_seed); printf("\n [*] Seed ES1: %u", wps->s1_seed);
seed_time = wps->s1_seed; seed_time = wps->s1_seed;
ts = *gmtime(&seed_time); ts = *gmtime(&seed_time);
strftime(buffer, 30, "%c", &ts); strftime(buffer, 30, "%c", &ts);
printf(" (%s UTC)", buffer); printf(" (%s UTC)", buffer);
printf("\n [*] Seed ES2: %u", wps->s2_seed); printf("\n [*] Seed ES2: %u", wps->s2_seed);
seed_time = wps->s2_seed; seed_time = wps->s2_seed;
ts = *gmtime(&seed_time); ts = *gmtime(&seed_time);
strftime(buffer, 30, "%c", &ts); strftime(buffer, 30, "%c", &ts);
printf(" (%s UTC)", buffer); printf(" (%s UTC)", buffer);
}
else {
printf("\n [*] Seed N1: -");
printf("\n [*] Seed ES1: -");
printf("\n [*] Seed ES2: -");
}
} }
else { else {
if (found_p_mode == RT && wps->nonce_seed == 0) printf("\n [*] Seed N1: -");
printf("\n [*] Seed N1: -"); printf("\n [*] Seed ES1: -");
else printf("\n [*] Seed ES2: -");
printf("\n [*] Seed N1: 0x%08x", wps->nonce_seed);
printf("\n [*] Seed ES1: 0x%08x", wps->s1_seed);
printf("\n [*] Seed ES2: 0x%08x", wps->s2_seed);
} }
} }
else {
if (found_p_mode == RT && wps->nonce_seed == 0)
printf("\n [*] Seed N1: -");
else
printf("\n [*] Seed N1: 0x%08x", wps->nonce_seed);
printf("\n [*] Seed ES1: 0x%08x", wps->s1_seed);
printf("\n [*] Seed ES2: 0x%08x", wps->s2_seed);
}
} }
}
if (wps->verbosity > 2) {
if (wps->dhkey) { /* To see if AuthKey was supplied or not */ if (wps->dhkey) { /* To see if AuthKey was supplied or not */
printf("\n [*] DHKey: "); byte_array_print(wps->dhkey, WPS_HASH_LEN); printf("\n [*] DHKey: "); byte_array_print(wps->dhkey, WPS_HASH_LEN);
printf("\n [*] KDK: "); byte_array_print(wps->kdk, WPS_HASH_LEN); printf("\n [*] KDK: "); byte_array_print(wps->kdk, WPS_HASH_LEN);