commit d68133c745ccecf2baf86fad08bfd40070c7368c Merge: a5b5d4b b6eee53 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 17 10:12:37 2015 -0400

Merge branch '13642_offline_master_v2_squashed'

configure.ac | 3 ++ src/common/compat.c | 33 ++++++++++++ src/common/compat.h | 2 + src/or/config.c | 5 +- src/or/main.c | 3 ++ src/or/or.h | 3 +- src/or/routerkeys.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++++-- src/or/routerkeys.h | 6 +++ 8 files changed, 199 insertions(+), 5 deletions(-)

diff --cc src/or/routerkeys.c index e79204c,63d61c3..277dc6e --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@@ -342,14 -478,13 +483,16 @@@ load_ed_keys(const or_options_t *option flags |= INIT_ED_KEY_MISSING_SECRET_OK; if (! want_new_signing_key) flags |= INIT_ED_KEY_OMIT_SECRET; + if (options->command == CMD_KEYGEN) + flags |= INIT_ED_KEY_TRY_ENCRYPTED;

+ char *fname = + options_get_datadir_fname2(options, "keys", "ed25519_master_id"); id = ed_key_init_from_file( - options_get_datadir_fname2(options, "keys", "ed25519_master_id"), + fname, flags, LOG_WARN, NULL, 0, 0, 0, NULL); + tor_free(fname); if (!id) FAIL("Missing identity key"); if (tor_mem_is_zero((char*)id->seckey.seckey, sizeof(id->seckey)))