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

improvements all over the place

Browse source
This commit is contained in:
cathugger 2017-09-25 20:49:47 +03:00
parent 59c07f0fdf
commit 7887d086f2
7 changed files with 250 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -1,7 +1,8 @@
CC= gcc CC= gcc
CFLAGS= -O3 -march=native -Wall CSTD= -std=c99 -Wall -D_POSIX_C_SOURCE=200112L
#CFLAGS= -O0 -g3 -fsanitize=address CFLAGS= $(CSTD) -O3 -march=native
#CFLAGS= $(CSTD) -O0 -g3 -fsanitize=address
MV= mv MV= mv
ED25519OBJ= $(patsubst %.c,%.o,$(wildcard ed25519/ref10/*.c)) ED25519OBJ= $(patsubst %.c,%.o,$(wildcard ed25519/ref10/*.c))
@ -61,7 +62,7 @@ clean:
$(RM) $(EXE) $(RM) $(EXE)
depend: depend:
makedepend -Y -- $(CFLAGS) -- $(MAINOBJ:.o=.c) $(TEST_BASE16OBJ:.o=.c) $(TEST_BASE32OBJ:.o=.c) $(TEST_ED25519OBJ:.o=.c) makedepend -Y -- $(CSTD) -- $(MAINOBJ:.o=.c) $(TEST_BASE16OBJ:.o=.c) $(TEST_BASE32OBJ:.o=.c) $(TEST_ED25519OBJ:.o=.c)
# DO NOT DELETE THIS LINE # DO NOT DELETE THIS LINE

14
base16.h
View file

@ -1,3 +1,11 @@
// converts src[0:slen] to base16 string
char *base16_to(char *dst, const u8 *src, size_t slen); char *base16_to(char *dst,const u8 *src,size_t slen);
size_t base16_from(u8 *dst, u8 *dmask, const char *src); // calculates length needed to store data converted to base16
#define BASE16_TO_LEN(l) (((l) * 8 + 3) / 4)
// converts src string from base16
size_t base16_from(u8 *dst,u8 *dmask,const char *src);
// calculates length needed to store data converted from base16
#define BASE16_FROM_LEN(l) (((l) * 4 + 7) / 8)
// validates base16 string and optionally stores length of valid data
// returns 1 if whole string is good, 0 if string contains invalid data
int base16_valid(const char *src,size_t *count);

77
base16_from.c
View file

@ -4,32 +4,77 @@
#include "base16.h" #include "base16.h"
static const u8 base16f[256] = { static const u8 base16f[256] = {
['0'] = 0, ['1'] = 1, ['2'] = 2, ['3'] = 3, //00 01 02 03 04 05 06 07
['4'] = 4, ['5'] = 5, ['6'] = 6, ['7'] = 7, //08 09 0A 0B 0C 0D 0E 0F
['8'] = 8, ['9'] = 9, ['A'] = 10, ['B'] = 11, // 0x00..0x3F
['C'] = 12, ['D'] = 13, ['E'] = 14, ['F'] = 15, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x00
['a'] = 10, ['b'] = 11, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x08
['c'] = 12, ['d'] = 13, ['e'] = 14, ['f'] = 15, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x10
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x18
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x20
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x28
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, // 0x30
0x08, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x38
// 0x40..0x7F
0xFF, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0xFF, // 0x40
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x48
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x50
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x58
0xFF, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0xFF, // 0x60
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x68
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x70
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x78
// 0x80..0xBF
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
// 0xC0..0xFF
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
}; };
size_t base16_from(u8 *dst, u8 *dmask, const char *src) size_t base16_from(u8 *dst,u8 *dmask,const char *src)
{ {
int i, j, k = -1, l; size_t i, j, k = (size_t)-1, l, sk = 0;
u8 mask = 0; u8 mask = 0, cmask = 0;
for (i = 0;;i += 4) { for (i = 0;;i += 4) {
j = i/4; j = i/4;
l = i%8;
if (!src[j]) { if (!src[j]) {
if (!l) if (k != (size_t)-1)
mask = 0xFF; dst[k] &= cmask;
if (k >= 0) *dmask = cmask;
dst[k] &= mask; return k + 1;
*dmask = mask;
return (size_t)(k+1);
} }
l = i%8;
k = i/8; k = i/8;
if (k != sk)
cmask = 0;
sk = k;
mask = (0x0F << 4) >> l; mask = (0x0F << 4) >> l;
cmask |= mask;
dst[k] &= ~mask; dst[k] &= ~mask;
dst[k] |= (base16f[(u8)src[j]] << 4) >> l; dst[k] |= (base16f[(u8)src[j]] << 4) >> l;
} }
} }
int base16_valid(const char *src,size_t *count)
{
const char *p;
for (p = src;base16f[(u8)*p] != 0xFF;++p) ;
if (count)
*count = p - src;
return !*p;
}

13
base32.h
View file

@ -1,2 +1,11 @@
char *base32_to(char *dst, const u8 *src, size_t slen); // converts src[0:slen] to base32 string
size_t base32_from(u8 *dst, u8 *dmask, const char *src); char *base32_to(char *dst,const u8 *src,size_t slen);
// calculates length needed to store data converted to base32
#define BASE32_TO_LEN(l) (((l) * 8 + 4) / 5)
// converts src string from base32
size_t base32_from(u8 *dst,u8 *dmask,const char *src);
// calculates length needed to store data converted from base
#define BASE32_FROM_LEN(l) (((l) * 5 + 7) / 8)
// validates base32 string and optionally stores length of valid data
// returns 1 if whole string is good, 0 if string contains invalid data
int base32_valid(const char *src,size_t *count);

68
base32_from.c
View file

@ -4,14 +4,44 @@
#include "base32.h" #include "base32.h"
static const u8 base32f[256] = { static const u8 base32f[256] = {
['a'] = 0, ['b'] = 1, ['c'] = 2, ['d'] = 3, //00 01 02 03 04 05 06 07
['e'] = 4, ['f'] = 5, ['g'] = 6, ['h'] = 7, //08 09 0A 0B 0C 0D 0E 0F
['i'] = 8, ['j'] = 9, ['k'] = 10, ['l'] = 11, // 0x00..0x3F
['m'] = 12, ['n'] = 13, ['o'] = 14, ['p'] = 15, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x00
['q'] = 16, ['r'] = 17, ['s'] = 18, ['t'] = 19, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x08
['u'] = 20, ['v'] = 21, ['w'] = 22, ['x'] = 23, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x10
['y'] = 24, ['z'] = 25, ['2'] = 26, ['3'] = 27, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x18
['4'] = 28, ['5'] = 29, ['6'] = 30, ['7'] = 31, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x20
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x28
0xFF, 0xFF, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, // 0x30
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x38
// 0x40..0x7F
0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, // 0x40
0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, // 0x48
0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, // 0x50
0x17, 0x18, 0x19, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x58
0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, // 0x60
0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, // 0x68
0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, // 0x70
0x17, 0x18, 0x19, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0x78
// 0x80..0xBF
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
// 0xC0..0xFF
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
}; };
/* /*
+--first octet--+-second octet--+--third octet--+--forth octet--+--fifth octet--+ +--first octet--+-second octet--+--third octet--+--forth octet--+--fifth octet--+
@ -20,20 +50,19 @@ static const u8 base32f[256] = {
|4 3 2 1 0|4 3 2 1 0|4 3 2 1 0|4 3 2 1 0|4 3 2 1 0|4 3 2 1 0|4 3 2 1 0|4 3 2 1 0| |4 3 2 1 0|4 3 2 1 0|4 3 2 1 0|4 3 2 1 0|4 3 2 1 0|4 3 2 1 0|4 3 2 1 0|4 3 2 1 0|
+-1.index-+-2.index-+-3.index-+-4.index-+-5.index-+-6.index-+-7.index-+-8.index-+ +-1.index-+-2.index-+-3.index-+-4.index-+-5.index-+-6.index-+-7.index-+-8.index-+
*/ */
size_t base32_from(u8 *dst, u8 *dmask, const char *src) size_t base32_from(u8 *dst,u8 *dmask,const char *src)
{ {
int i, j, k = -1, l, sk = 0; size_t i, j, k = (size_t)-1, l, sk = 0;
u8 mask = 0, cmask = 0; u8 mask = 0, cmask = 0;
for (i = 0;;i += 5) { for (i = 0;;i += 5) {
j = i/5; j = i/5;
l = i%8;
if (!src[j]) { if (!src[j]) {
if (k >= 0) if (k != (size_t)-1)
dst[k] &= cmask; dst[k] &= cmask;
//printf("dst[k]:%02X mask:%02X l:%d\n", dst[k], (cmask & 0xFF), l);
*dmask = cmask; *dmask = cmask;
return (size_t)(k + 1); return k + 1;
} }
l = i%8;
k = i/8; k = i/8;
if (k != sk) if (k != sk)
cmask = 0; cmask = 0;
@ -57,3 +86,14 @@ size_t base32_from(u8 *dst, u8 *dmask, const char *src)
//printf("mask1: %02x\n", ((0x1F << 8) >> (i%8+5-8)) & 0xFF); //printf("mask1: %02x\n", ((0x1F << 8) >> (i%8+5-8)) & 0xFF);
} }
} }
int base32_valid(const char *src,size_t *count)
{
const char *p;
for (p = src;base32f[(u8)*p] != 0xFF;++p) ;
if (count)
*count = p - src;
return !*p;
}

2
base32_to.c
View file

@ -23,7 +23,7 @@ static const char base32t[32] = {
// masks: // masks:
// 0xFF 0x7F 0x3F 0x1F 0x0F 0x07 0x03 0x01 // 0xFF 0x7F 0x3F 0x1F 0x0F 0x07 0x03 0x01
// 255 127 63 31 15 7 3 1 // 255 127 63 31 15 7 3 1
char *base32_to(char *dst, const u8 *src, size_t slen) char *base32_to(char *dst,const u8 *src,size_t slen)
{ {
//printf("slen = %d\n", slen); //printf("slen = %d\n", slen);
//printhex(base32t, 32); //printhex(base32t, 32);

139
main.c
View file

@ -2,7 +2,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <assert.h>
#include <time.h>
#include <pthread.h> #include <pthread.h>
#include <signal.h>
#include <sodium/randombytes.h> #include <sodium/randombytes.h>
#include "ed25519/ref10/ed25519_ref10.h" #include "ed25519/ref10/ed25519_ref10.h"
#include "ed25519/ref10/ge.h" #include "ed25519/ref10/ge.h"
@ -41,11 +44,22 @@ static size_t direndpos; // end of dir before .onion within string
static size_t printstartpos; // where to start printing from static size_t printstartpos; // where to start printing from
static size_t printlen; // precalculated, related to printstartpos static size_t printlen; // precalculated, related to printstartpos
static FILE *fout;
static pthread_mutex_t fout_mutex; static pthread_mutex_t fout_mutex;
static FILE *fout;
static volatile int endwork = 0; static size_t numneedgenerate = 0;
static pthread_mutex_t keysgenerated_mutex;
static volatile size_t keysgenerated = 0; static volatile size_t keysgenerated = 0;
static volatile int endwork = 0;
static void termhandler(int sig)
{
switch (sig) {
case SIGTERM:
case SIGINT:
endwork = 1;
break;
}
}
struct binfilter { struct binfilter {
u8 *f; u8 *f;
@ -62,17 +76,25 @@ static void filters_init()
static void filters_add(const char *filter) static void filters_add(const char *filter)
{ {
u8 buf[256];
struct binfilter bf; struct binfilter bf;
size_t ret; size_t ret, ret2;
ret = base32_from(buf,&bf.mask,filter); if (!base32_valid(filter,&ret)) {
//printf("--m:%02X\n", bf.mask); fprintf(stderr, "filter \"%s\" is invalid\n", filter);
return;
}
ret = BASE32_FROM_LEN(ret);
if (!ret) if (!ret)
return; return;
if (ret > PUBLIC_LEN) {
fprintf(stderr, "filter \"%s\" is too long\n", filter);
return;
}
bf.f = malloc(ret); bf.f = malloc(ret);
ret2 = base32_from(bf.f,&bf.mask,filter);
assert(ret == ret2);
//printf("--m:%02X\n", bf.mask);
bf.len = ret - 1; bf.len = ret - 1;
memcpy(bf.f,buf,ret);
VEC_ADD(bfilters,bf); VEC_ADD(bfilters,bf);
} }
@ -100,8 +122,13 @@ static void loadfilterfile(const char *fname)
static void printfilters() static void printfilters()
{ {
fprintf(stderr, "current filters:\n"); size_t i,l = VEC_LENGTH(bfilters);
for (size_t i = 0; i < VEC_LENGTH(bfilters); ++i) { if (l)
fprintf(stderr, "filters:\n");
else
fprintf(stderr, "no filters defined\n");
for (i = 0;i < l;++i) {
char buf0[256],buf1[256]; char buf0[256],buf1[256];
u8 bufx[128]; u8 bufx[128];
size_t len = VEC_BUF(bfilters,i).len + 1; size_t len = VEC_BUF(bfilters,i).len + 1;
@ -122,9 +149,37 @@ static void onionready(char *sname, const u8 *secret, const u8 *pubonion)
{ {
FILE *fh; FILE *fh;
if (mkdir(sname, 0700) != 0) if (endwork)
return; return;
if (numneedgenerate) {
pthread_mutex_lock(&keysgenerated_mutex);
if (keysgenerated >= numneedgenerate) {
pthread_mutex_unlock(&keysgenerated_mutex);
return;
}
}
if (mkdir(sname, 0700) != 0) {
if (numneedgenerate)
pthread_mutex_unlock(&keysgenerated_mutex);
return;
}
if (numneedgenerate) {
++keysgenerated;
if (keysgenerated >= numneedgenerate)
endwork = 1;
pthread_mutex_unlock(&keysgenerated_mutex);
}
strcpy(&sname[onionendpos], "/hs_ed25519_secret_key");
fh = fopen(sname, "wb");
if (fh) {
fwrite(secret, skprefixlen + SECRET_LEN, 1, fh);
fclose(fh);
}
strcpy(&sname[onionendpos], "/hostname"); strcpy(&sname[onionendpos], "/hostname");
fh = fopen(sname, "w"); fh = fopen(sname, "w");
if (fh) { if (fh) {
@ -140,21 +195,13 @@ static void onionready(char *sname, const u8 *secret, const u8 *pubonion)
fclose(fh); fclose(fh);
} }
strcpy(&sname[onionendpos], "/hs_ed25519_secret_key");
fh = fopen(sname, "wb");
if (fh) {
fwrite(secret, skprefixlen + SECRET_LEN, 1, fh);
fclose(fh);
}
sname[onionendpos] = '\n'; sname[onionendpos] = '\n';
pthread_mutex_lock(&fout_mutex);
if (fout) { if (fout) {
pthread_mutex_lock(&fout_mutex);
fwrite(&sname[printstartpos], printlen, 1, fout); fwrite(&sname[printstartpos], printlen, 1, fout);
fflush(fout); fflush(fout);
pthread_mutex_unlock(&fout_mutex);
} }
++keysgenerated;
pthread_mutex_unlock(&fout_mutex);
} }
// little endian inc // little endian inc
@ -185,7 +232,7 @@ static void *dowork(void *task)
memcpy(hashsrc,checksumstr,checksumstrlen); memcpy(hashsrc,checksumstr,checksumstrlen);
hashsrc[checksumstrlen + PUBLIC_LEN] = 0x03; // version hashsrc[checksumstrlen + PUBLIC_LEN] = 0x03; // version
sname = alloca(workdirlen + ONIONLEN + 63 + 1); sname = malloc(workdirlen + ONIONLEN + 63 + 1);
if (workdir) if (workdir)
memcpy(sname,workdir,workdirlen); memcpy(sname,workdir,workdirlen);
@ -215,6 +262,7 @@ again:
goto again; goto again;
end: end:
free(sname);
return 0; return 0;
} }
@ -274,7 +322,7 @@ static void *dofastwork(void *task)
memcpy(hashsrc, checksumstr, checksumstrlen); memcpy(hashsrc, checksumstr, checksumstrlen);
hashsrc[checksumstrlen + PUBLIC_LEN] = 0x03; // version hashsrc[checksumstrlen + PUBLIC_LEN] = 0x03; // version
sname = alloca(workdirlen + ONIONLEN + 63 + 1); sname = malloc(workdirlen + ONIONLEN + 63 + 1);
if (workdir) if (workdir)
memcpy(sname, workdir, workdirlen); memcpy(sname, workdir, workdirlen);
@ -327,6 +375,7 @@ initseed:
goto initseed; goto initseed;
end: end:
free(sname);
return 0; return 0;
} }
@ -392,6 +441,7 @@ int main(int argc, char **argv)
filters_init(); filters_init();
fout = stdout; fout = stdout;
pthread_mutex_init(&keysgenerated_mutex, 0);
pthread_mutex_init(&fout_mutex, 0); pthread_mutex_init(&fout_mutex, 0);
const char *progname = argv[0]; const char *progname = argv[0];
@ -467,6 +517,14 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
} }
else if (*arg == 'n') {
if (argc--)
numneedgenerate = (size_t)atoll(*argv++);
else {
fprintf(stderr, "additional argument required\n");
exit(1);
}
}
else if (*arg == 'z') else if (*arg == 'z')
fastkeygen = 1; fastkeygen = 1;
else { else {
@ -478,7 +536,7 @@ int main(int argc, char **argv)
} }
else filters_add(arg); else filters_add(arg);
} }
if (outfile) if (outfile)
fout = fopen(outfile, "w"); fout = fopen(outfile, "w");
@ -487,10 +545,10 @@ int main(int argc, char **argv)
if (workdir) if (workdir)
mkdir(workdir, 0700); mkdir(workdir, 0700);
direndpos = workdirlen; direndpos = workdirlen;
onionendpos = workdirlen + ONIONLEN; onionendpos = workdirlen + ONIONLEN;
if (!dirnameflag) { if (!dirnameflag) {
printstartpos = direndpos; printstartpos = direndpos;
printlen = ONIONLEN + 1; printlen = ONIONLEN + 1;
@ -498,15 +556,18 @@ int main(int argc, char **argv)
printstartpos = 0; printstartpos = 0;
printlen = onionendpos + 1; printlen = onionendpos + 1;
} }
if (numthreads <= 0) { if (numthreads <= 0) {
// TODO: autodetect // TODO: autodetect
numthreads = 1; numthreads = 1;
} }
signal(SIGTERM, termhandler);
signal(SIGINT, termhandler);
VEC_INIT(threads); VEC_INIT(threads);
VEC_ADDN(threads, pthread_t, numthreads); VEC_ADDN(threads, pthread_t, numthreads);
for (size_t i = 0; i < VEC_LENGTH(threads); ++i) { for (size_t i = 0; i < VEC_LENGTH(threads); ++i) {
tret = pthread_create(&VEC_BUF(threads, i), 0, fastkeygen ? dofastwork : dowork, 0); tret = pthread_create(&VEC_BUF(threads, i), 0, fastkeygen ? dofastwork : dowork, 0);
if (tret) { if (tret) {
@ -514,14 +575,30 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
} }
struct timespec ts;
memset(&ts,0,sizeof(ts));
ts.tv_nsec = 100000000;
while (!endwork) {
if (numneedgenerate && keysgenerated >= numneedgenerate) {
endwork = 1;
break;
}
nanosleep(&ts,0);
}
fprintf(stderr, "waiting for threads to finish...\n"); fprintf(stderr, "waiting for threads to finish...\n");
for (size_t i = 0; i < VEC_LENGTH(threads); ++i) { for (size_t i = 0; i < VEC_LENGTH(threads); ++i) {
pthread_join(VEC_BUF(threads, i), 0); pthread_join(VEC_BUF(threads, i), 0);
} }
fprintf(stderr, "done, quitting\n"); fprintf(stderr, "done, quitting\n");
pthread_mutex_destroy(&keysgenerated_mutex);
pthread_mutex_destroy(&fout_mutex); pthread_mutex_destroy(&fout_mutex);
filters_clean(); filters_clean();
if (outfile)
fclose(fout);
return 0; return 0;
} }