diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-08-30 09:44:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-03 08:37:22 -0400 |
| commit | 99b3e54691f451b766556391cba6e26120ad7d84 (patch) | |
| tree | 5a2eec11702909d0a02680c317e68ff89a657dc4 /src/or/or.h | |
| parent | 0704fa8a63c2e203162c359e184e63b10c45630c (diff) | |
| download | tor-99b3e54691f451b766556391cba6e26120ad7d84.tar.gz tor-99b3e54691f451b766556391cba6e26120ad7d84.zip | |
Add "Ed ID" arguments to a bunch of connection-ID-related fns.
In particular, these functions are the ones that set the identity of
a given connection or channel, and/or confirm that we have learned
said IDs.
There's a lot of stub code here: we don't actually need to use the
new keys till we start looking up connections/channels by Ed25519
IDs. Still, we want to start passing the Ed25519 IDs in now, so it
makes sense to add these stubs as part of 15055.
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h index 5feba28ba0..65d40579cb 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1419,6 +1419,8 @@ typedef struct or_handshake_state_t { /* True iff we've received valid authentication to some identity. */ unsigned int authenticated : 1; + unsigned int authenticated_rsa : 1; + unsigned int authenticated_ed25519 : 1; /* True iff we have sent a netinfo cell */ unsigned int sent_netinfo : 1; @@ -1436,9 +1438,12 @@ typedef struct or_handshake_state_t { unsigned int digest_received_data : 1; /**@}*/ - /** Identity digest that we have received and authenticated for our peer + /** Identity RSA digest that we have received and authenticated for our peer * on this connection. */ - uint8_t authenticated_peer_id[DIGEST_LEN]; + uint8_t authenticated_rsa_peer_id[DIGEST_LEN]; + /** Identity Ed25519 public key that we have received and authenticated for + * our peer on this connection. */ + ed25519_public_key_t authenticated_ed25519_peer_id; /** Digests of the cells that we have sent or received as part of a V3 * handshake. Used for making and checking AUTHENTICATE cells. |