diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-06-05 15:52:06 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-06-05 15:52:06 -0400 |
commit | e3b1573be6aefc91946fa4649591ed1690d77ee8 (patch) | |
tree | 449e6a0f317b7ce73a18b3c34477f474247f074f /src/or/or.h | |
parent | dd573f72b2f20b9aec310ee298ac4e9b737f835d (diff) | |
parent | 91f49bc0f0759d0e0a794fbfe8cce5a9bb07e607 (diff) | |
download | tor-e3b1573be6aefc91946fa4649591ed1690d77ee8.tar.gz tor-e3b1573be6aefc91946fa4649591ed1690d77ee8.zip |
Merge branch 'maint-0.3.0'
Diffstat (limited to 'src/or/or.h')
-rw-r--r-- | src/or/or.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 0d29e19d75..1f55b55062 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1471,6 +1471,12 @@ typedef struct or_handshake_state_t { /* True iff we have sent a netinfo cell */ unsigned int sent_netinfo : 1; + /** The signing->ed25519 link certificate corresponding to the x509 + * certificate we used on the TLS connection (if this is a server-side + * connection). We make a copy of this here to prevent a race condition + * caused by TLS context rotation. */ + struct tor_cert_st *own_link_cert; + /** True iff we should feed outgoing cells into digest_sent and * digest_received respectively. * |