[tor-commits] [tor/release-0.3.3] Fix a crash bug when testing reachability

[nickm at torproject.org]

commit 3d126632430fe60e7ced72bf82cd2c16f297297e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Mar 4 10:31:17 2018 -0500

    Fix a crash bug when testing reachability
    
    Fixes bug 25415; bugfix on 0.3.3.2-alpha.
---
 changes/bug25415 | 4 ++++
 src/or/dirserv.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug25415 b/changes/bug25415
new file mode 100644
index 000000000..ec851aee8
--- /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 981efc67f..1c1610ff9 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;