nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tone down the logging.

Browse Source
This commit is contained in:
George Kadianakis 2011-11-24 06:12:22 +01:00
parent 8a726dd0dd
commit cabb8e54c7
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/crypto.c
View File

@ -1842,7 +1842,7 @@ crypto_generate_dynamic_prime(void)
{ /* log the dynamic prime: */ { /* log the dynamic prime: */
s = BN_bn2hex(dynamic_prime); s = BN_bn2hex(dynamic_prime);
tor_assert(s); tor_assert(s);
log_notice(LD_OR, "Dynamic prime generated: [%s]", s); log_info(LD_OR, "Dynamic prime generated: [%s]", s);
OPENSSL_free(s); OPENSSL_free(s);
} }
@ -1874,10 +1874,10 @@ crypto_set_tls_dh_prime(int use_dynamic_primes, BIGNUM *stored_dynamic_prime)
if (use_dynamic_primes) { /* use dynamic primes: */ if (use_dynamic_primes) { /* use dynamic primes: */
if (stored_dynamic_prime) { if (stored_dynamic_prime) {
log_warn(LD_OR, "Using stored dynamic prime."); log_info(LD_OR, "Using stored dynamic prime.");
tls_prime = stored_dynamic_prime; tls_prime = stored_dynamic_prime;
} else { } else {
log_notice(LD_OR, "Generating fresh dynamic prime."); log_info(LD_OR, "Generating fresh dynamic prime.");
tls_prime = crypto_generate_dynamic_prime(); tls_prime = crypto_generate_dynamic_prime();
} }
} else { /* use the static DH prime modulus used by Apache in mod_ssl: */ } else { /* use the static DH prime modulus used by Apache in mod_ssl: */

28
src/or/router.c
View File

@ -492,19 +492,26 @@ router_store_dynamic_prime(const BIGNUM *dynamic_prime)
FILE *fp = NULL; FILE *fp = NULL;
char *fname = get_datadir_fname2("keys", "dynamic_prime"); char *fname = get_datadir_fname2("keys", "dynamic_prime");
int retval = -1; int retval = -1;
file_status_t fname_status = file_status(fname);
if (file_status(fname) != FN_NOENT) { if (fname_status == FN_FILE) {
log_warn(LD_GENERAL, "Dynamic prime already occupied."); /* If the fname is a file, then the dynamic prime is already stored. */
retval = 0;
goto done;
} else if (fname_status != FN_NOENT) {
log_info(LD_GENERAL, "Dynamic prime filename is occupied.");
goto done; goto done;
} }
tor_assert(fname_status == FN_NOENT);
if (!(fp = fopen(fname, "w"))) { if (!(fp = fopen(fname, "w"))) {
log_warn(LD_GENERAL, "Error writing to certificate file"); log_notice(LD_GENERAL, "Error while creating dynamic prime file.");
goto done; goto done;
} }
if (BN_print_fp(fp, dynamic_prime) == 0) { if (BN_print_fp(fp, dynamic_prime) == 0) {
log_warn(LD_GENERAL, "Error on bn_print_fp()"); log_warn(LD_GENERAL, "Error while printing dynamic prime to file.");
goto done; goto done;
} }
@ -531,21 +538,20 @@ router_get_stored_dynamic_prime(void)
goto err; goto err;
contents = read_file_to_str(fname, RFTS_IGNORE_MISSING, NULL); contents = read_file_to_str(fname, RFTS_IGNORE_MISSING, NULL);
if (!contents) { if (!contents)
log_warn(LD_GENERAL, "Error reading dynamic prime from \"%s\"", fname);
goto err; goto err;
}
retval = BN_hex2bn(&dynamic_prime, contents); retval = BN_hex2bn(&dynamic_prime, contents);
if (!retval) { if (!retval) {
log_warn(LD_GENERAL, "C0rrupted dynamic prime?!?!"); log_notice(LD_GENERAL, "Could not understand the dynamic prime "
"format in '%s'", fname);
goto err; goto err;
} }
{ /* log the dynamic prime: */ { /* log the dynamic prime: */
char *s = BN_bn2hex(dynamic_prime); char *s = BN_bn2hex(dynamic_prime);
tor_assert(s); tor_assert(s);
log_notice(LD_OR, "Found stored dynamic prime: [%s]", s); log_info(LD_OR, "Found stored dynamic prime: [%s]", s);
OPENSSL_free(s); OPENSSL_free(s);
} }
@ -719,8 +725,8 @@ init_keys(void)
BIGNUM *dynamic_prime = crypto_get_tls_dh_prime(); BIGNUM *dynamic_prime = crypto_get_tls_dh_prime();
if (dynamic_prime) { if (dynamic_prime) {
if (router_store_dynamic_prime(dynamic_prime) < 0) if (router_store_dynamic_prime(dynamic_prime) < 0)
log_warn(LD_GENERAL, "Failed while storing dynamic prime. " log_notice(LD_GENERAL, "Failed while storing dynamic prime. "
"Make sure your data directory is sane."); "Make sure your data directory is sane.");
} }
} }