Improve logging.

This commit is contained in:
George Kadianakis 2011-11-22 13:55:07 +01:00
parent 1797e0a39e
commit fb38e58d14

View File

@ -1829,24 +1829,27 @@ crypto_generate_dynamic_prime(void)
DH *dh_parameters; DH *dh_parameters;
int r; int r;
int dh_codes; int dh_codes;
char *s;
dh_parameters = DH_new(); dh_parameters = DH_new();
dynamic_prime = BN_new(); dynamic_prime = BN_new();
misc = BN_new(); misc = BN_new();
tor_assert(dynamic_prime); tor_assert(dynamic_prime);
log_notice(LD_OR, "Generating Dynamic prime; this will take a while...");
dh_parameters = DH_generate_parameters(DH_BYTES*8, DH_GENERATOR, NULL, NULL); // XXX Do we want a pretty call back? dh_parameters = DH_generate_parameters(DH_BYTES*8, DH_GENERATOR, NULL, NULL); // XXX Do we want a pretty call back?
tor_assert(dh_parameters); tor_assert(dh_parameters);
log_notice(LD_OR, "Dynamic prime generated!");
log_notice(LD_OR, "Testing our Dynamic prime; this will take a while...");
r = DH_check(dh_parameters, &dh_codes); r = DH_check(dh_parameters, &dh_codes);
tor_assert(r); tor_assert(r);
log_notice(LD_OR, "Dynamic prime seems probabilistically reasonable!");
misc = BN_copy(dynamic_prime, dh_parameters->p); misc = BN_copy(dynamic_prime, dh_parameters->p);
tor_assert(misc); tor_assert(misc);
DH_free(dh_parameters); DH_free(dh_parameters);
{
s = BN_bn2hex(dynamic_prime);
log_notice(LD_OR, "Dynamic prime generated: [%s]", s);
OPENSSL_free(s);
}
return dynamic_prime; return dynamic_prime;
} }
@ -1875,6 +1878,7 @@ init_dh_param(void)
/* This implements the prime number strategy outlined in prop 179 */ /* This implements the prime number strategy outlined in prop 179 */
if (use_dynamic_primes) { if (use_dynamic_primes) {
log_notice(LD_OR, "Generating fresh dynamic prime.");
dynamic_prime = crypto_generate_dynamic_prime(); dynamic_prime = crypto_generate_dynamic_prime();
} }