[tor-commits] [tor/master] Comment-only: note some places where we want to propagate Ed25519 info

[nickm at torproject.org]

commit 88252b2d76f94de587d49144177e9e339699d1c5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 28 16:11:05 2016 -0400

    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.
---
 src/or/circuituse.c | 7 ++++++-
 src/or/or.h         | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index eda53b4..eaecfd9 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 0ebeda2..14c2dd8 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