From 226f047aefcbf8759872339d259f66663dce3aad Mon Sep 17 00:00:00 2001 From: cathugger Date: Thu, 14 Feb 2019 00:07:20 +0000 Subject: [PATCH] yaml stuff won't care about deterministic pw stuff --- common.h | 8 -------- main.c | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/common.h b/common.h index 26d4570..23ea257 100644 --- a/common.h +++ b/common.h @@ -13,14 +13,6 @@ // full onion address, WITHOUT newline #define ONION_LEN 62 -// How many times we loop before a reseed -#define DETERMINISTIC_LOOP_COUNT 1<<24 - -// Argon2 hashed passphrase stretching settings -#define PWHASH_OPSLIMIT 64 -#define PWHASH_MEMLIMIT 64 * 1024 * 1024 -#define PWHASH_ALG crypto_pwhash_ALG_ARGON2ID13 - extern pthread_mutex_t fout_mutex; extern FILE *fout; diff --git a/main.c b/main.c index e3fc45f..ecfefda 100644 --- a/main.c +++ b/main.c @@ -41,6 +41,15 @@ static const char * const skprefix = "== ed25519v1-secret: type0 ==\0\0"; static const char checksumstr[] = ".onion checksum"; #define checksumstrlen (sizeof(checksumstr) - 1) // 15 +// How many times we loop before a reseed +#define DETERMINISTIC_LOOP_COUNT 1<<24 + +// Argon2 hashed passphrase stretching settings +#define PWHASH_OPSLIMIT 64 +#define PWHASH_MEMLIMIT 64 * 1024 * 1024 +#define PWHASH_ALG crypto_pwhash_ALG_ARGON2ID13 + + // output directory static char *workdir = 0; static size_t workdirlen = 0;