diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-28 16:11:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-08 16:47:58 -0500 |
| commit | 88252b2d76f94de587d49144177e9e339699d1c5 (patch) | |
| tree | 2727ea6e98cca56449719260a205aed9ec847586 /src/or | |
| parent | 9e840e6c7d10a3dfa188d2186ce3c67ca1d698f5 (diff) | |
| download | tor-88252b2d76f94de587d49144177e9e339699d1c5.tar.gz tor-88252b2d76f94de587d49144177e9e339699d1c5.zip | |
Comment-only: note some places where we want to propagate Ed25519 info
This is not for 15056, since it's about UI, and not about circuit
extension.
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/circuituse.c | 7 | ||||
| -rw-r--r-- | src/or/or.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index eda53b418c..eaecfd9dc0 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -2088,6 +2088,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; @@ -2102,9 +2106,10 @@ 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, /* Ed25519 ID 15056, add a workaround.*/ + NULL, /* Ed25519 ID */ NULL, NULL, /* onion keys */ &addr, conn->socks_request->port); } else { /* ! (want_onehop && conn->chosen_exit_name[0] == '$') */ diff --git a/src/or/or.h b/src/or/or.h index 0ebeda285a..14c2dd8bc2 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1658,6 +1658,8 @@ typedef struct entry_connection_t { edge_connection_t edge_; /** 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; socks_request_t *socks_request; /**< SOCKS structure describing request (AP |