[tor-commits] [tor/master] s/DynamicPrimes/DynamicDHGroups/g

[nickm at torproject.org]

commit 782c907c7cbd3bf2bb75680f5d3deb2d984052de
Author: George Kadianakis <desnacked at gmail.com>
Date:   Fri Nov 25 01:00:14 2011 +0100

    s/DynamicPrimes/DynamicDHGroups/g
---
 src/or/config.c |   10 +++++-----
 src/or/or.h     |    2 +-
 src/or/router.c |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index e1e71b0..fc3cc74 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -247,7 +247,7 @@ static config_var_t _option_vars[] = {
   VAR("DirServer",               LINELIST, DirServers, NULL),
   V(DisableAllSwap,              BOOL,     "0"),
   V(DisableIOCP,                 BOOL,     "1"),
-  V(DynamicPrimes,               BOOL,     "1"),
+  V(DynamicDHGroups,             BOOL,     "1"),
   V(DNSPort,                     LINELIST, NULL),
   V(DNSListenAddress,            LINELIST, NULL),
   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 (!old_options) {
-    if (options->DynamicPrimes) {
+    if (options->DynamicDHGroups) {
       char *fname = get_datadir_fname2("keys", "dynamic_prime");
       crypto_set_tls_dh_prime(fname);
       tor_free(fname);
@@ -1372,11 +1372,11 @@ options_act(const or_options_t *old_options)
       crypto_set_tls_dh_prime(NULL);
     }
   } else {
-    if (options->DynamicPrimes && !old_options->DynamicPrimes) {
+    if (options->DynamicDHGroups && !old_options->DynamicDHGroups) {
       char *fname = get_datadir_fname2("keys", "dynamic_prime");
       crypto_set_tls_dh_prime(fname);
       tor_free(fname);
-    } else if (!options->DynamicPrimes && old_options->DynamicPrimes) {
+    } else if (!options->DynamicDHGroups && old_options->DynamicDHGroups) {
       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) ||
       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->ServerDNSSearchDomains !=
                                        new_options->ServerDNSSearchDomains ||
diff --git a/src/or/or.h b/src/or/or.h
index b2ea3bc..e3feeed 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2873,7 +2873,7 @@ typedef struct {
   char *Address; /**< OR only: configured address for this onion router. */
   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,
                            * country codes and IP address patterns of ORs to
diff --git a/src/or/router.c b/src/or/router.c
index c554d5b..fa791fc 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -635,7 +635,7 @@ init_keys(void)
   }
 
   /** 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");
     if (crypto_store_dynamic_prime(fname)) {
       log_notice(LD_GENERAL, "Failed while storing dynamic prime. "