diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-04 21:39:54 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-01-03 11:29:46 -0500 |
| commit | 18c7d3f157957a5c8034e165d0fc09490c25b0ba (patch) | |
| tree | cf67236953ce8d6d10ca0d287b0df9d2e4dab880 /src/or/or.h | |
| parent | f58d4dfcd61aec7ea1900873ca08ecc31d7a7ef7 (diff) | |
| download | tor-18c7d3f157957a5c8034e165d0fc09490c25b0ba.tar tor-18c7d3f157957a5c8034e165d0fc09490c25b0ba.tar.gz | |
Rename handshake_digest to rend_circ_nonce
The handshake_digest field was never meaningfully a digest *of* the
handshake, but rather is a digest *from* the handshake that we exapted
to prevent replays of ESTABLISH_INTRO cells. The ntor handshake will
generate it as more key material rather than taking it from any part
of the circuit handshake reply..
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/or/or.h b/src/or/or.h index f7407a8e9..d349d1134 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2568,8 +2568,7 @@ typedef struct crypt_path_t { crypto_dh_t *rend_dh_handshake_state; /** Negotiated key material shared with the OR at this step. */ - /* XXXX RENAME */ - char handshake_digest[DIGEST_LEN];/* KH in tor-spec.txt */ + char rend_circ_nonce[DIGEST_LEN];/* KH in tor-spec.txt */ /** Information to extend to the OR at this step. */ extend_info_t *extend_info; @@ -2978,8 +2977,8 @@ typedef struct or_circuit_t { char rend_token[REND_TOKEN_LEN]; /* ???? move to a subtype or adjunct structure? Wastes 20 bytes -NM */ - /* XXXX rename this. */ - char handshake_digest[DIGEST_LEN]; /**< Stores KH for the handshake. */ + /** Stores KH for the handshake. */ + char rend_circ_nonce[DIGEST_LEN];/* KH in tor-spec.txt */ /** How many more relay_early cells can we send on this circuit, according * to the specification? */ |