tor

commit 699bb803baba942c6bcd50542183b283fa191163
parent e5a990fc5a5440b48e49029e937c852fc45f246b
Author: Nick Mathewson <nickm@torproject.org>
Date:   Sun,  4 Mar 2018 10:31:17 -0500

Fix a crash bug when testing reachability

Fixes bug 25415; bugfix on 0.3.3.2-alpha.

Diffstat:
A
changes/bug25415
 | 
4
++++
M
src/or/dirserv.c
 | 
3
++-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug25415 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
@@ -3392,7 +3392,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;