diff options
author | George Kadianakis <desnacked@gmail.com> | 2011-11-26 19:29:57 +0100 |
---|---|---|
committer | George Kadianakis <desnacked@gmail.com> | 2011-11-26 19:29:57 +0100 |
commit | 055d6c01fff3324dbb38c2d81ad49ccfdb5432c2 (patch) | |
tree | 91703162538ff1bd3df00b07eb06d7470c1e8328 /src/or | |
parent | f28014bf1aa4274a35404ccc37b559b5531f1835 (diff) | |
download | tor-055d6c01fff3324dbb38c2d81ad49ccfdb5432c2.tar tor-055d6c01fff3324dbb38c2d81ad49ccfdb5432c2.tar.gz |
Write dynamic DH parameters to a file.
Instead of only writing the dynamic DH prime modulus to a file, write
the whole DH parameters set for forward compatibility. At the moment
we only accept '2' as the group generator.
The DH parameters gets stored in base64-ed DER format to the
'dynamic_dh_params' file.
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/config.c | 4 | ||||
-rw-r--r-- | src/or/router.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c index 9c658614b..06914b62a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1384,7 +1384,7 @@ options_act(const or_options_t *old_options) if (server_mode(options)) { if (!old_options) { if (options->DynamicDHGroups) { - char *fname = get_datadir_fname2("keys", "dynamic_dh_modulus"); + char *fname = get_datadir_fname2("keys", "dynamic_dh_params"); crypto_set_tls_dh_prime(fname); tor_free(fname); } else { @@ -1392,7 +1392,7 @@ options_act(const or_options_t *old_options) } } else { if (options->DynamicDHGroups && !old_options->DynamicDHGroups) { - char *fname = get_datadir_fname2("keys", "dynamic_dh_modulus"); + char *fname = get_datadir_fname2("keys", "dynamic_dh_params"); crypto_set_tls_dh_prime(fname); tor_free(fname); } else if (!options->DynamicDHGroups && old_options->DynamicDHGroups) { diff --git a/src/or/router.c b/src/or/router.c index 67e98da23..5d36939a8 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -484,7 +484,6 @@ v3_authority_check_key_expiry(void) last_warned = now; } - int router_initialize_tls_context(void) { |