diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-09 09:17:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-09 09:17:53 -0500 |
| commit | 06260315645945ca9e08b5a19b67c8adad65a698 (patch) | |
| tree | 52d4a7cd26645cceb9f4204eb72bca29eea27766 /src/or/dirserv.c | |
| parent | 59c1016aba63c62e658065475add3cf77f665afa (diff) | |
| parent | 3124c921e7af15548b8b16d5f239bfdcd178b2ca (diff) | |
| download | tor-06260315645945ca9e08b5a19b67c8adad65a698.tar.gz tor-06260315645945ca9e08b5a19b67c8adad65a698.zip | |
Merge branch 'ticket20895'
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index ddee92da55..293a6e15d6 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3284,7 +3284,7 @@ dirserv_orconn_tls_done(const tor_addr_t *addr, ri = node->ri; if (get_options()->AuthDirTestEd25519LinkKeys && - node_supports_ed25519_link_authentication(node) && + node_supports_ed25519_link_authentication(node, 1) && ri->cache_info.signing_key_cert) { /* We allow the node to have an ed25519 key if we haven't been told one in * the routerinfo, but if we *HAVE* been told one in the routerinfo, it @@ -3367,7 +3367,7 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router) tor_assert(node); if (options->AuthDirTestEd25519LinkKeys && - node_supports_ed25519_link_authentication(node)) { + node_supports_ed25519_link_authentication(node, 1)) { ed_id_key = &router->cache_info.signing_key_cert->signing_key; } else { ed_id_key = NULL; |