nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

s/DynamicPrimes/DynamicDHGroups/g

Browse Source
This commit is contained in:
George Kadianakis 2011-11-25 01:00:14 +01:00
parent bdeb797a13
commit 782c907c7c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/config.c
View File

@ -247,7 +247,7 @@ static config_var_t _option_vars[] = {
VAR("DirServer", LINELIST, DirServers, NULL), VAR("DirServer", LINELIST, DirServers, NULL),
V(DisableAllSwap, BOOL, "0"), V(DisableAllSwap, BOOL, "0"),
V(DisableIOCP, BOOL, "1"), V(DisableIOCP, BOOL, "1"),
V(DynamicPrimes, BOOL, "1"), V(DynamicDHGroups, BOOL, "1"),
V(DNSPort, LINELIST, NULL), V(DNSPort, LINELIST, NULL),
V(DNSListenAddress, LINELIST, NULL), V(DNSListenAddress, LINELIST, NULL),
V(DownloadExtraInfo, BOOL, "0"), V(DownloadExtraInfo, BOOL, "0"),
@ -1364,7 +1364,7 @@ options_act(const or_options_t *old_options)
/* If needed, generate a new TLS DH prime according to the current torrc. */ /* If needed, generate a new TLS DH prime according to the current torrc. */
if (!old_options) { if (!old_options) {
if (options->DynamicPrimes) { if (options->DynamicDHGroups) {
char *fname = get_datadir_fname2("keys", "dynamic_prime"); char *fname = get_datadir_fname2("keys", "dynamic_prime");
crypto_set_tls_dh_prime(fname); crypto_set_tls_dh_prime(fname);
tor_free(fname); tor_free(fname);
@ -1372,11 +1372,11 @@ options_act(const or_options_t *old_options)
crypto_set_tls_dh_prime(NULL); crypto_set_tls_dh_prime(NULL);
} }
} else { } else {
if (options->DynamicPrimes && !old_options->DynamicPrimes) { if (options->DynamicDHGroups && !old_options->DynamicDHGroups) {
char *fname = get_datadir_fname2("keys", "dynamic_prime"); char *fname = get_datadir_fname2("keys", "dynamic_prime");
crypto_set_tls_dh_prime(fname); crypto_set_tls_dh_prime(fname);
tor_free(fname); tor_free(fname);
} else if (!options->DynamicPrimes && old_options->DynamicPrimes) { } else if (!options->DynamicDHGroups && old_options->DynamicDHGroups) {
crypto_set_tls_dh_prime(NULL); crypto_set_tls_dh_prime(NULL);
} }
} }
@ -4071,7 +4071,7 @@ options_transition_affects_workers(const or_options_t *old_options,
{ {
if (!opt_streq(old_options->DataDirectory, new_options->DataDirectory) || if (!opt_streq(old_options->DataDirectory, new_options->DataDirectory) ||
old_options->NumCPUs != new_options->NumCPUs || old_options->NumCPUs != new_options->NumCPUs ||
old_options->DynamicPrimes != new_options->DynamicPrimes || old_options->DynamicDHGroups != new_options->DynamicDHGroups ||
old_options->ORPort != new_options->ORPort || old_options->ORPort != new_options->ORPort ||
old_options->ServerDNSSearchDomains != old_options->ServerDNSSearchDomains !=
new_options->ServerDNSSearchDomains || new_options->ServerDNSSearchDomains ||

2
src/or/or.h
View File

@ -2873,7 +2873,7 @@ typedef struct {
char *Address; /**< OR only: configured address for this onion router. */ char *Address; /**< OR only: configured address for this onion router. */
char *PidFile; /**< Where to store PID of Tor process. */ char *PidFile; /**< Where to store PID of Tor process. */
int DynamicPrimes; /**< Enable dynamic generation of primes for use in DH. */ int DynamicDHGroups; /**< Enable dynamic generation of primes for use in DH. */
routerset_t *ExitNodes; /**< Structure containing nicknames, digests, routerset_t *ExitNodes; /**< Structure containing nicknames, digests,
* country codes and IP address patterns of ORs to * country codes and IP address patterns of ORs to

2
src/or/router.c
View File

@ -635,7 +635,7 @@ init_keys(void)
} }
/** 3b. If we use a dynamic prime, store it to disk. */ /** 3b. If we use a dynamic prime, store it to disk. */
if (get_options()->DynamicPrimes) { if (get_options()->DynamicDHGroups) {
char *fname = get_datadir_fname2("keys", "dynamic_prime"); char *fname = get_datadir_fname2("keys", "dynamic_prime");
if (crypto_store_dynamic_prime(fname)) { if (crypto_store_dynamic_prime(fname)) {
log_notice(LD_GENERAL, "Failed while storing dynamic prime. " log_notice(LD_GENERAL, "Failed while storing dynamic prime. "