aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-09-01 10:22:24 -0400
committerNick Mathewson <nickm@torproject.org>2015-09-04 09:55:07 -0400
commit0ba4e0895ae2395a528aacd1625715a7ffc29211 (patch)
tree998c4aa45c25327adf8db702433c04ab9d053b9e /src/or/or.h
parentd891e2a9c517e2b097456b7143f955ac66b112ea (diff)
downloadtor-0ba4e0895ae2395a528aacd1625715a7ffc29211.tar.gz
tor-0ba4e0895ae2395a528aacd1625715a7ffc29211.zip
Add "OfflineMasterKey" option
When this is set, and Tor is running as a relay, it will not generate or load its secret identity key. You can manage the secret identity key with --keygen. Implements ticket 16944.
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 8c40f1ab67..b753f7c11e 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4295,6 +4295,10 @@ typedef struct {
/** How long before auth keys expire will we try to make a new one? */
int TestingAuthKeySlop;
+ /** Force use of offline master key features: never generate a master
+ * ed25519 identity key except from tor --keygen */
+ int OfflineMasterKey;
+
enum {
FORCE_PASSPHRASE_AUTO=0,
FORCE_PASSPHRASE_ON,
@@ -4302,6 +4306,7 @@ typedef struct {
} keygen_force_passphrase;
int use_keygen_passphrase_fd;
int keygen_passphrase_fd;
+
} or_options_t;
/** Persistent state for an onion router, as saved to disk. */