aboutsummaryrefslogtreecommitdiff
path: root/src/or/router.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-10-01 11:54:07 -0400
committerNick Mathewson <nickm@torproject.org>2015-05-28 10:40:57 -0400
commitefa21bb94188863e4ff5d8a288144cd93db00fe3 (patch)
tree34cc8c4bd847477e4b57773f48c0d298ef15d3ef /src/or/router.h
parentfe5d2477aabbf06c940c33a266d6ebb3a7b19fe1 (diff)
downloadtor-efa21bb94188863e4ff5d8a288144cd93db00fe3.tar.gz
tor-efa21bb94188863e4ff5d8a288144cd93db00fe3.zip
Implement proposal 228: cross-certification with onion keys
Routers now use TAP and ntor onion keys to sign their identity keys, and put these signatures in their descriptors. That allows other parties to be confident that the onion keys are indeed controlled by the router that generated the descriptor.
Diffstat (limited to 'src/or/router.h')
-rw-r--r--src/or/router.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/router.h b/src/or/router.h
index c53a104ebc..cb813c6813 100644
--- a/src/or/router.h
+++ b/src/or/router.h
@@ -91,7 +91,9 @@ int router_is_me(const routerinfo_t *router);
int router_pick_published_address(const or_options_t *options, uint32_t *addr);
int router_rebuild_descriptor(int force);
char *router_dump_router_to_string(routerinfo_t *router,
- crypto_pk_t *ident_key,
+ const crypto_pk_t *ident_key,
+ const crypto_pk_t *tap_key,
+ const curve25519_keypair_t *ntor_keypair,
const ed25519_keypair_t *signing_keypair);
char *router_dump_exit_policy_to_string(const routerinfo_t *router,
int include_ipv4,