diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-08 16:49:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-08 16:49:24 -0500 |
| commit | e93234af70da5cf3d513e57b12e4934b1c4d9529 (patch) | |
| tree | e8c72b7f9a1cbbedd154444bdb23b54c051c48ea /src/or/circuituse.c | |
| parent | e33c85a450c4819cdad30acfc280aece7c521d6e (diff) | |
| parent | 236e8b605e6aebf87787951ca05f5c75ad530c8a (diff) | |
| download | tor-e93234af70da5cf3d513e57b12e4934b1c4d9529.tar.gz tor-e93234af70da5cf3d513e57b12e4934b1c4d9529.zip | |
Merge branch 'feature15056_v1_squashed'
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index bc72015a5f..04c5af92e8 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -2168,6 +2168,10 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn, if (want_onehop && conn->chosen_exit_name[0] == '$') { /* We're asking for a one-hop circuit to a router that * we don't have a routerinfo about. Make up an extend_info. */ + /* XXX prop220: we need to make chosen_exit_name able to + * encode both key formats. This is not absolutely critical + * since this is just for one-hop circuits, but we should + * still get it done */ char digest[DIGEST_LEN]; char *hexdigest = conn->chosen_exit_name+1; tor_addr_t addr; @@ -2182,9 +2186,12 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn, escaped_safe_str_client(conn->socks_request->address)); return -1; } + /* XXXX prop220 add a workaround for ed25519 ID below*/ extend_info = extend_info_new(conn->chosen_exit_name+1, - digest, NULL, NULL, &addr, - conn->socks_request->port); + digest, + NULL, /* Ed25519 ID */ + NULL, NULL, /* onion keys */ + &addr, conn->socks_request->port); } else { /* ! (want_onehop && conn->chosen_exit_name[0] == '$') */ /* We will need an onion key for the router, and we * don't have one. Refuse or relax requirements. */ |