phantom/mkp224o
1
0
Fork 0
mirror of https://github.com/cathugger/mkp224o.git synced 2025-01-09 19:17:19 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

compile batch keygen by default

Browse source
This commit is contained in:
cathugger 2019-01-27 20:32:25 +02:00
parent 0ec0f85446
commit 0befa419b1
No known key found for this signature in database
GPG key ID: 9BADDA2DAF6F01A8
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
main.c
View file

@ -517,8 +517,6 @@ end:
}
#endif // PASSPHRASE
#ifdef BATCHKEYGEN
#ifndef BATCHNUM
#define BATCHNUM 2048
#endif
@ -640,7 +638,6 @@ end:
sodium_memzero(seed,sizeof(seed));
return 0;
}
#endif // BATCHKEYGEN
static void printhelp(FILE *out,const char *progname)
{
@ -662,11 +659,9 @@ static void printhelp(FILE *out,const char *progname)
"\t-j numthreads - same as -t\n"
"\t-n numkeys - specify number of keys (default - 0 - unlimited)\n"
"\t-N numwords - specify number of words per key (default - 1)\n"
"\t-z - use faster key generation method. this is now default\n"
"\t-z - use faster key generation method; this is now default\n"
"\t-Z - use slower key generation method\n"
#ifdef BATCHKEYGEN
"\t-B - use batching key generation\n"
#endif
"\t-B - use batching key generation method (>10x faster than -z, experimental)\n"
"\t-s - print statistics each 10 seconds\n"
"\t-S t - print statistics every specified ammount of seconds\n"
"\t-T - do not reset statistics counters when printing\n"
@ -733,9 +728,7 @@ int main(int argc,char **argv)
int dirnameflag = 0;
int numthreads = 0;
int fastkeygen = 1;
#ifdef BATCHKEYGEN
int batchkeygen = 0;
#endif
int yamlinput = 0;
#ifdef PASSPHRASE
int deterministic = 0;
@ -864,10 +857,8 @@ int main(int argc,char **argv)
fastkeygen = 0;
else if (*arg == 'z')
fastkeygen = 1;
#ifdef BATCHKEYGEN
else if (*arg == 'B')
batchkeygen = 1;
#endif
else if (*arg == 's') {
#ifdef STATISTICS
reportdelay = 10000000;
@ -1068,9 +1059,7 @@ int main(int argc,char **argv)
#ifdef PASSPHRASE
deterministic ? dofastworkdeterministic :
#endif
#ifdef BATCHKEYGEN
batchkeygen ? dobatchwork :
#endif
(fastkeygen ? dofastwork : dowork),tp);
if (tret) {
fprintf(stderr,"error while making " FSZ "th thread: %s\n",i,strerror(tret));