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

Changed default behavior to use all cores available

Browse Source 
Used workaround to make it compile on Windows with some MinGW
installations
This commit is contained in:
wiire-a 2017-10-14 11:43:10 +02:00
parent e2f480a900
commit 7d0f03d400
2 changed files with 53 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/pixiewps.c
View File

@ -82,10 +82,10 @@ static struct job_control {
volatile uint32_t print_seed; volatile uint32_t print_seed;
} job_control; } job_control;
static void* crack_thread(void *arg) { static void *crack_thread(void *arg) {
struct crack_job * j = arg; struct crack_job *j = arg;
struct random_data *buf = calloc(1, sizeof(struct random_data)); struct random_data *buf = calloc(1, sizeof(struct random_data));
char *rand_statebuf = calloc(1, 128); char *rand_statebuf = calloc(128, 1);
uint32_t seed = j->start; uint32_t seed = j->start;
uint32_t limit = job_control.end; uint32_t limit = job_control.end;
@ -94,7 +94,7 @@ static void* crack_thread(void *arg) {
while (!job_control.print_seed) { while (!job_control.print_seed) {
srandom_r(seed, buf); srandom_r(seed, buf);
unsigned i; unsigned int i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
random_r(buf, &res); random_r(buf, &res);
if ((uint32_t) res != job_control.randr_enonce[i]) if ((uint32_t) res != job_control.randr_enonce[i])
@ -106,13 +106,13 @@ static void* crack_thread(void *arg) {
DEBUG_PRINT("Seed found"); DEBUG_PRINT("Seed found");
} }
if(seed == 0) break; if (seed == 0) break;
seed--; seed--;
if(seed < j->start - SECS_PER_JOB_BLOCK) { if (seed < j->start - SECS_PER_JOB_BLOCK) {
long long tmp = j->start - SECS_PER_JOB_BLOCK * job_control.jobs; long long tmp = j->start - SECS_PER_JOB_BLOCK * job_control.jobs;
if(tmp < 0) break; if (tmp < 0) break;
j->start = tmp; j->start = tmp;
seed = j->start; seed = j->start;
if (seed < limit) break; if (seed < limit) break;
@ -121,8 +121,8 @@ static void* crack_thread(void *arg) {
return 0; return 0;
} }
static void init_crack_jobs(int jobs, struct global *wps) { static void init_crack_jobs(struct global *wps) {
job_control.jobs = jobs; job_control.jobs = wps->jobs;
job_control.end = wps->end; job_control.end = wps->end;
job_control.print_seed = 0; job_control.print_seed = 0;
memset(job_control.randr_enonce, 0, sizeof(job_control.randr_enonce)); memset(job_control.randr_enonce, 0, sizeof(job_control.randr_enonce));
@ -137,28 +137,55 @@ static void init_crack_jobs(int jobs, struct global *wps) {
job_control.randr_enonce[i] <<= 8; job_control.randr_enonce[i] <<= 8;
job_control.randr_enonce[i] |= wps->e_nonce[j++]; job_control.randr_enonce[i] |= wps->e_nonce[j++];
} }
job_control.crack_jobs = malloc(jobs * sizeof (struct job_control)); job_control.crack_jobs = malloc(wps->jobs * sizeof (struct job_control));
time_t curr = wps->start; time_t curr = wps->start;
for(i=0; i<jobs; i++) { for(i = 0; i < wps->jobs; i++) {
job_control.crack_jobs[i].start = curr; job_control.crack_jobs[i].start = curr;
pthread_create(&job_control.crack_jobs[i].thr, NULL, crack_thread, &job_control.crack_jobs[i]); pthread_create(&job_control.crack_jobs[i].thr, NULL, crack_thread, &job_control.crack_jobs[i]);
curr -= SECS_PER_JOB_BLOCK; curr -= SECS_PER_JOB_BLOCK;
} }
} }
static uint32_t collect_crack_jobs(void) { static uint32_t collect_crack_jobs() {
int i; int i;
for(i=0;i<job_control.jobs;i++) { for (i = 0; i < job_control.jobs; i++) {
void* ret; void* ret;
pthread_join(job_control.crack_jobs[i].thr, &ret); pthread_join(job_control.crack_jobs[i].thr, &ret);
} }
return job_control.print_seed; return job_control.print_seed;
} }
unsigned int hardware_concurrency() {
#if defined(PTW32_VERSION) || defined(__hpux)
return pthread_num_processors_np();
#elif defined(__APPLE__) || defined(__FreeBSD__)
int count;
size_t size = sizeof(count);
return sysctlbyname("hw.ncpu", &count, &size, NULL, 0) ? 0 : count;
#elif defined(_SC_NPROCESSORS_ONLN) /* unistd.h */
int const count = sysconf(_SC_NPROCESSORS_ONLN);
return (count > 0) ? count : 0;
#elif defined(__GLIBC__)
return get_nprocs();
#elif defined(_WIN32) || defined(__WIN32__)
# define static /* Workaround to make it compile on some MinGW installations */
# include <windows.h>
# undef static
# define static static
SYSTEM_INFO sysinfo;
GetSystemInfo(&sysinfo);
return sysinfo.dwNumberOfProcessors;
#else
return 0;
#endif
}
int main(int argc, char **argv) { int main(int argc, char **argv) {
struct global *wps; struct global *wps;
if ((wps = calloc(1, sizeof(struct global)))) { if ((wps = calloc(1, sizeof(struct global)))) {
unsigned int cores = hardware_concurrency();
wps->jobs = cores == 0 ? 1 : cores;
wps->mode_auto = 1; wps->mode_auto = 1;
wps->verbosity = 3; wps->verbosity = 3;
wps->error = calloc(256, 1); wps->error = calloc(256, 1);
@ -177,13 +204,15 @@ memory_err:
int opt = 0; int opt = 0;
int long_index = 0; int long_index = 0;
uint_fast8_t c = 0; uint_fast8_t c = 0;
int jobs = 1;
opt = getopt_long(argc, argv, option_string, long_options, &long_index); opt = getopt_long(argc, argv, option_string, long_options, &long_index);
while (opt != -1) { while (opt != -1) {
c++; c++;
switch (opt) { switch (opt) {
case 'j': case 'j':
jobs = atoi(optarg); if (get_int(optarg, &wps->jobs) != 0 || wps->jobs < 1) {
snprintf(wps->error, 256, "\n [!] Bad number of jobs -- %s\n\n", optarg);
goto usage_err;
}
break; break;
case 'e': case 'e':
wps->pke = malloc(WPS_PKEY_LEN); wps->pke = malloc(WPS_PKEY_LEN);
@ -277,7 +306,7 @@ memory_err:
if (get_int(optarg, &wps->verbosity) != 0 || wps->verbosity < 1 || wps->verbosity > 3) { if (get_int(optarg, &wps->verbosity) != 0 || wps->verbosity < 1 || wps->verbosity > 3) {
snprintf(wps->error, 256, "\n [!] Bad verbosity level -- %s\n\n", optarg); snprintf(wps->error, 256, "\n [!] Bad verbosity level -- %s\n\n", optarg);
goto usage_err; goto usage_err;
}; }
break; break;
case 'V': case 'V':
{ {
@ -285,6 +314,7 @@ memory_err:
snprintf(wps->error, 256, "\n [!] Bad use of argument --version (-V)!\n\n"); snprintf(wps->error, 256, "\n [!] Bad use of argument --version (-V)!\n\n");
goto usage_err; goto usage_err;
} else { } else {
unsigned int cores = hardware_concurrency();
struct timeval t_current; struct timeval t_current;
gettimeofday(&t_current, 0); gettimeofday(&t_current, 0);
time_t r_time; time_t r_time;
@ -293,8 +323,10 @@ memory_err:
r_time = t_current.tv_sec; r_time = t_current.tv_sec;
ts = *gmtime(&r_time); ts = *gmtime(&r_time);
strftime(buffer, 30, "%c", &ts); strftime(buffer, 30, "%c", &ts);
fprintf(stderr, "\n Pixiewps %s\n\n [*] System time: %lu (%s UTC)\n\n", fprintf(stderr, "\n Pixiewps %s\n\n"
LONG_VERSION, (unsigned long) t_current.tv_sec, buffer); " [*] System time: %lu (%s UTC)\n"
" [*] Number of cores available: %u\n\n",
LONG_VERSION, (unsigned long) t_current.tv_sec, buffer, cores == 0 ? 1 : cores);
free(wps->error); free(wps->error);
free(wps); free(wps);
return ARG_ERROR; return ARG_ERROR;
@ -672,8 +704,7 @@ usage_err:
if (!(wps->e_nonce[0] & 0x80) && !(wps->e_nonce[4] & 0x80) && if (!(wps->e_nonce[0] & 0x80) && !(wps->e_nonce[4] & 0x80) &&
!(wps->e_nonce[8] & 0x80) && !(wps->e_nonce[12] & 0x80)) { !(wps->e_nonce[8] & 0x80) && !(wps->e_nonce[12] & 0x80)) {
init_crack_jobs(jobs, wps); init_crack_jobs(wps);
#if DEBUG #if DEBUG
{ {

3
src/pixiewps.h
View File

@ -104,6 +104,7 @@ struct global {
uint8_t mode_auto; uint8_t mode_auto;
uint8_t bruteforce; uint8_t bruteforce;
uint8_t anylength; uint8_t anylength;
unsigned jobs;
int verbosity; int verbosity;
char *error; char *error;
char *warning; char *warning;
@ -134,7 +135,7 @@ char usage[] =
" -l, --length : Brute-force entire pin length (experimental)\n" " -l, --length : Brute-force entire pin length (experimental)\n"
" -v, --verbosity : Verbosity level 1-3, 1 is quietest [3]\n" " -v, --verbosity : Verbosity level 1-3, 1 is quietest [3]\n"
" -o, --output : Write output to file\n" " -o, --output : Write output to file\n"
" -j, --jobs : Number of parallel threads to use [1]\n" " -j, --jobs : Number of parallel threads to use [Auto]\n"
"\n" "\n"
" -h : Display this usage screen\n" " -h : Display this usage screen\n"
" --help : Verbose help and more usage examples\n" " --help : Verbose help and more usage examples\n"