nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.2'

Browse Source
This commit is contained in:
Nick Mathewson 2017-10-27 08:05:04 -04:00
commit a0f8c01004
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug24002 Normal file
View File

@ -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.

4
src/or/hs_service.c
View File

@ -1564,6 +1564,10 @@ pick_intro_point(unsigned int direct_conn, smartlist_t *exclude_nodes)
* protocol */ * protocol */
if (!node_supports_ed25519_link_authentication(node)) { if (!node_supports_ed25519_link_authentication(node)) {
tor_assert_nonfatal(ed25519_public_key_is_zero(&info->ed_identity)); 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. */ /* Create our objects and populate them with the node information. */