summaryrefslogtreecommitdiff
path: root/src/or/routerkeys.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-09-01 10:58:53 -0400
committerNick Mathewson <nickm@torproject.org>2015-09-22 09:24:35 -0400
commitbca4211de5464cd159592b359b2f16eb64d3c07f (patch)
tree462b3d2249f6330cf977bd3c0282853e84b45065 /src/or/routerkeys.h
parentd8f031aec2ee84c753ef282577c7f4fcf0123d2f (diff)
downloadtor-bca4211de5464cd159592b359b2f16eb64d3c07f.tar.gz
tor-bca4211de5464cd159592b359b2f16eb64d3c07f.zip
Add a --master-key option
This lets the user override the default location for the master key when used with --keygen Part of 16769.
Diffstat (limited to 'src/or/routerkeys.h')
-rw-r--r--src/or/routerkeys.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/routerkeys.h b/src/or/routerkeys.h
index b4e73aa33f..f9eb777e90 100644
--- a/src/or/routerkeys.h
+++ b/src/or/routerkeys.h
@@ -17,6 +17,7 @@
#define INIT_ED_KEY_TRY_ENCRYPTED (1u<<8)
#define INIT_ED_KEY_NO_REPAIR (1u<<9)
#define INIT_ED_KEY_SUGGEST_KEYGEN (1u<<10)
+#define INIT_ED_KEY_EXPLICIT_FNAME (1u<<11)
struct tor_cert_st;
ed25519_keypair_t *ed_key_init_from_file(const char *fname, uint32_t flags,