torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson
2020-11-12 08:47:05 -05:00
parent dde6b8906f 0c79cddc6b
commit 7d8290f0ac
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug40015
+4
View File
@@ -0,0 +1,4 @@
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.
src/feature/relay/router.c
+6 -3
View File
@@ -386,7 +386,8 @@ MOCK_IMPL(crypto_pk_t *,
get_server_identity_key,(void))
{
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();
return server_identitykey;
}
@@ -398,7 +399,9 @@ get_server_identity_key,(void))
int
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>.
@@ -941,7 +944,7 @@ init_keys(void)
/* OP's don't need persistent keys; just make up an identity and
* initialize the TLS context. */
if (!server_mode(options)) {
if (!server_mode(options) && !(options->command == CMD_KEY_EXPIRATION)) {
return init_keys_client();
}
if (init_keys_common() < 0)