aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.h
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/circuitbuild.h
parent8406677a5e6db74bd593a7d43868054b54b147df (diff)
downloadtor-b5e75ae7dd536f17f96179fc7744031131fb97b2.tar.gz
tor-b5e75ae7dd536f17f96179fc7744031131fb97b2.zip
Add an ed25519 identity to extend_info
Diffstat (limited to 'src/or/circuitbuild.h')
-rw-r--r--src/or/circuitbuild.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h
index 1244601f71..f71c116eda 100644
--- a/src/or/circuitbuild.h
+++ b/src/or/circuitbuild.h
@@ -46,9 +46,11 @@ int circuit_all_predicted_ports_handled(time_t now, int *need_uptime,
int circuit_append_new_exit(origin_circuit_t *circ, extend_info_t *info);
int circuit_extend_to_new_exit(origin_circuit_t *circ, extend_info_t *info);
void onion_append_to_cpath(crypt_path_t **head_ptr, crypt_path_t *new_hop);
-extend_info_t *extend_info_new(const char *nickname, const char *digest,
+extend_info_t *extend_info_new(const char *nickname,
+ const char *rsa_id_digest,
+ const ed25519_public_key_t *ed_id,
crypto_pk_t *onion_key,
- const curve25519_public_key_t *curve25519_key,
+ const curve25519_public_key_t *ntor_key,
const tor_addr_t *addr, uint16_t port);
extend_info_t *extend_info_from_node(const node_t *r, int for_direct_connect);
extend_info_t *extend_info_dup(extend_info_t *info);