From 0c79cddc6b9f8f62eef0ebf0d6aa05563061954f Mon Sep 17 00:00:00 2001
From: Neel Chauhan <neel@neelc.org>
Date: Tue, 27 Oct 2020 11:10:11 -0700
Subject: Avoid asserts with  flag

---
 src/feature/relay/router.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/feature/relay')

diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index 5ca21964b6..29103ed6c6 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -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)
-- 
cgit v1.2.3-54-g00ecf