tor

commit dbbd60331352da8f985ddfc988fbe5f97e3f23af
parent a7ca08934341deab05d48fa0f074543116a29c38
Author: George Kadianakis <desnacked@riseup.net>
Date:   Wed, 27 Jan 2021 15:43:01 +0200

Merge remote-tracking branch 'tor-gitlab/mr/248'

Diffstat:
A
changes/bug40235
 | 
5
+++++
M
src/app/config/config.c
 | 
4
+++-

2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/changes/bug40235 b/changes/bug40235
@@ -0,0 +1,5 @@
+  o Minor bugfixes (key generation):
+    - Do not require a valid torrc when using the `--keygen` argument
+      to generate a signing key. This allows us to generate keys on
+      systems or users which may not run Tor. Fixes bug 40235; bugfix
+      on 0.2.7.2-alpha. Patch by Neel Chauhan.
diff --git a/src/app/config/config.c b/src/app/config/config.c
@@ -4321,6 +4321,7 @@ find_torrc_filename(const config_line_t *cmd_arg,
   const config_line_t *p_index;
   const char *fname_opt = defaults_file ? "--defaults-torrc" : "-f";
   const char *ignore_opt = defaults_file ? NULL : "--ignore-missing-torrc";
+  const char *keygen_opt = "--keygen";
 
   if (defaults_file)
     *ignore_missing_torrc = 1;
@@ -4342,7 +4343,8 @@ find_torrc_filename(const config_line_t *cmd_arg,
       }
 
       *using_default_fname = 0;
-    } else if (ignore_opt && !strcmp(p_index->key,ignore_opt)) {
+    } else if ((ignore_opt && !strcmp(p_index->key, ignore_opt)) ||
+               (keygen_opt && !strcmp(p_index->key, keygen_opt))) {
       *ignore_missing_torrc = 1;
     }
   }