commit a0f8c010049f8d0fee375041948287cd65bef12a parent 4af1653e0f5fe305aff340e7b7f47c1f965ef3ca Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 27 Oct 2017 08:05:04 -0400 Merge branch 'maint-0.3.2' Diffstat:
| A | changes/bug24002 | | | 5 | +++++ |
| M | src/or/hs_service.c | | | 4 | ++++ |
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/changes/bug24002 b/changes/bug24002 @@ -0,0 +1,5 @@ + o Minor bugfixes (hidden service): + - Make sure that we have a usable ed25519 key when the intro point relay + does support ed25519 link authentication. We do check for an empty key + when the relay does not support it so this makes it nice and symmetric. + Fixes bug 24002; bugfix on 0.3.2.1-alpha. diff --git a/src/or/hs_service.c b/src/or/hs_service.c @@ -1564,6 +1564,10 @@ pick_intro_point(unsigned int direct_conn, smartlist_t *exclude_nodes) * protocol */ if (!node_supports_ed25519_link_authentication(node)) { tor_assert_nonfatal(ed25519_public_key_is_zero(&info->ed_identity)); + } else { + /* Make sure we *do* have an ed key if we support the link authentication. + * Sending an empty key would result in a failure to extend. */ + tor_assert_nonfatal(!ed25519_public_key_is_zero(&info->ed_identity)); } /* Create our objects and populate them with the node information. */