aboutsummaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-09-14 14:34:25 -0400
committerNick Mathewson <nickm@torproject.org>2016-11-10 09:43:27 -0500
commitb5e75ae7dd536f17f96179fc7744031131fb97b2 (patch)
tree3ee30b7013dd856e7d90a2db3b09b343cc32458e /src/or/router.c
parent8406677a5e6db74bd593a7d43868054b54b147df (diff)
downloadtor-b5e75ae7dd536f17f96179fc7744031131fb97b2.tar.gz
tor-b5e75ae7dd536f17f96179fc7744031131fb97b2.zip
Add an ed25519 identity to extend_info
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/router.c b/src/or/router.c
index 79caf42a2a..bc0eb3a34a 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1312,8 +1312,15 @@ extend_info_from_router(const routerinfo_t *r)
/* Make sure we don't need to check address reachability */
tor_assert_nonfatal(router_skip_or_reachability(get_options(), 0));
+ const ed25519_public_key_t *ed_id_key;
+ if (r->cache_info.signing_key_cert)
+ ed_id_key = &r->cache_info.signing_key_cert->signing_key;
+ else
+ ed_id_key = NULL;
+
router_get_prim_orport(r, &ap);
return extend_info_new(r->nickname, r->cache_info.identity_digest,
+ ed_id_key,
r->onion_pkey, r->onion_curve25519_pkey,
&ap.addr, ap.port);
}