Commit 7d8290f0 authored by Nick Mathewson's avatar Nick Mathewson 🎃
Browse files

Merge remote-tracking branch 'tor-gitlab/mr/183' into master

parents dde6b890 0c79cddc
o Major bugfixes (crash, relay, signing key):
- Avoid asserts when we run Tor from the command line with
`--key-expiration sign` when an ORPort is not set. Fixes
bug 40015; bugfix on 0.3.2.1-alpha. Patch by Neel Chauhan.
...@@ -386,7 +386,8 @@ MOCK_IMPL(crypto_pk_t *, ...@@ -386,7 +386,8 @@ MOCK_IMPL(crypto_pk_t *,
get_server_identity_key,(void)) get_server_identity_key,(void))
{ {
tor_assert(server_identitykey); tor_assert(server_identitykey);
tor_assert(server_mode(get_options())); tor_assert(server_mode(get_options()) ||
get_options()->command == CMD_KEY_EXPIRATION);
assert_identity_keys_ok(); assert_identity_keys_ok();
return server_identitykey; return server_identitykey;
} }
...@@ -398,7 +399,9 @@ get_server_identity_key,(void)) ...@@ -398,7 +399,9 @@ get_server_identity_key,(void))
int int
server_identity_key_is_set(void) server_identity_key_is_set(void)
{ {
return server_mode(get_options()) && server_identitykey != NULL; return (server_mode(get_options()) ||
get_options()->command == CMD_KEY_EXPIRATION) &&
server_identitykey != NULL;
} }
/** Set the current client identity key to <b>k</b>. /** Set the current client identity key to <b>k</b>.
...@@ -941,7 +944,7 @@ init_keys(void) ...@@ -941,7 +944,7 @@ init_keys(void)
/* OP's don't need persistent keys; just make up an identity and /* OP's don't need persistent keys; just make up an identity and
* initialize the TLS context. */ * initialize the TLS context. */
if (!server_mode(options)) { if (!server_mode(options) && !(options->command == CMD_KEY_EXPIRATION)) {
return init_keys_client(); return init_keys_client();
} }
if (init_keys_common() < 0) if (init_keys_common() < 0)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment