From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 4 Mar 2018 15:31:17 +0000 (-0500)
Subject: Fix a crash bug when testing reachability
X-Git-Tag: tor-0.3.3.6~14^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d126632430fe60e7ced72bf82cd2c16f297297e;p=thirdparty%2Ftor.git

Fix a crash bug when testing reachability

Fixes bug 25415; bugfix on 0.3.3.2-alpha.
---

diff --git a/changes/bug25415 b/changes/bug25415
new file mode 100644
index 0000000000..ec851aee8d
--- /dev/null
+++ b/changes/bug25415
@@ -0,0 +1,4 @@
+  o Major bugfixes (directory authority):
+    - Avoid a crash when testing router reachability on a router that could
+      have an ed25519 ID, but which does not. Fixes bug 25415; bugfix on
+      0.3.3.2-alpha.
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 981efc67f7..1c1610ff93 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -3402,7 +3402,8 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router)
   tor_assert(node);
 
   if (options->AuthDirTestEd25519LinkKeys &&
-      node_supports_ed25519_link_authentication(node, 1)) {
+      node_supports_ed25519_link_authentication(node, 1) &&
+      router->cache_info.signing_key_cert) {
     ed_id_key = &router->cache_info.signing_key_cert->signing_key;
   } else {
     ed_id_key = NULL;