nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Comment-only: note some places where we want to propagate Ed25519 info

Browse Source 
This is not for 15056, since it's about UI, and not about circuit
extension.
This commit is contained in:
Nick Mathewson 2016-10-28 16:11:05 -04:00
parent 9e840e6c7d
commit 88252b2d76
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/circuituse.c
View File

@ -2088,6 +2088,10 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn,
if (want_onehop && conn->chosen_exit_name[0] == '$') { if (want_onehop && conn->chosen_exit_name[0] == '$') {
/* We're asking for a one-hop circuit to a router that /* We're asking for a one-hop circuit to a router that
* we don't have a routerinfo about. Make up an extend_info. */ * 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 digest[DIGEST_LEN];
char *hexdigest = conn->chosen_exit_name+1; char *hexdigest = conn->chosen_exit_name+1;
tor_addr_t addr; tor_addr_t addr;
@ -2102,9 +2106,10 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn,
escaped_safe_str_client(conn->socks_request->address)); escaped_safe_str_client(conn->socks_request->address));
return -1; return -1;
} }
/* XXXX prop220 add a workaround for ed25519 ID below*/
extend_info = extend_info_new(conn->chosen_exit_name+1, extend_info = extend_info_new(conn->chosen_exit_name+1,
digest, digest,
NULL, /* Ed25519 ID 15056, add a workaround.*/ NULL, /* Ed25519 ID */
NULL, NULL, /* onion keys */ NULL, NULL, /* onion keys */
&addr, conn->socks_request->port); &addr, conn->socks_request->port);
} else { /* ! (want_onehop && conn->chosen_exit_name[0] == '$') */ } else { /* ! (want_onehop && conn->chosen_exit_name[0] == '$') */

2
src/or/or.h
View File

@ -1658,6 +1658,8 @@ typedef struct entry_connection_t {
edge_connection_t edge_; edge_connection_t edge_;
/** Nickname of planned exit node -- used with .exit support. */ /** Nickname of planned exit node -- used with .exit support. */
/* XXX prop220: we need to make chosen_exit_name able to encode Ed IDs too.
* That's logically part of the UI parts for prop220 though. */
char *chosen_exit_name; char *chosen_exit_name;
socks_request_t *socks_request; /**< SOCKS structure describing request (AP socks_request_t *socks_request; /**< SOCKS structure describing request (AP