aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-17 19:48:49 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-17 19:48:49 -0400
commita7f6e434be6aa402153af0c6dd3238c58e35ed27 (patch)
treef5fe87713048ee9e7b89da553b974fa0b420de10 /src/or/or.h
parent36909674b45d05854b821b6ac5952126a2cd2ab3 (diff)
parent3f49474349538be499ab485c697c147c8829fa0d (diff)
downloadtor-a7f6e434be6aa402153af0c6dd3238c58e35ed27.tar.gz
tor-a7f6e434be6aa402153af0c6dd3238c58e35ed27.zip
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 86664d470d..24c3641dab 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2070,6 +2070,10 @@ typedef struct signed_descriptor_t {
time_t published_on;
/** For routerdescs only: digest of the corresponding extrainfo. */
char extra_info_digest[DIGEST_LEN];
+ /** For routerdescs only: A SHA256-digest of the extrainfo (if any) */
+ char extra_info_digest256[DIGEST256_LEN];
+ /** Certificate for ed25519 signing key. */
+ struct tor_cert_st *signing_key_cert;
/** For routerdescs only: Status of downloading the corresponding
* extrainfo. */
download_status_t ei_dl_status;
@@ -2101,8 +2105,6 @@ typedef int16_t country_t;
/** Information about another onion router in the network. */
typedef struct {
signed_descriptor_t cache_info;
- /** A SHA256-digest of the extrainfo (if any) */
- char extra_info_digest256[DIGEST256_LEN];
char *nickname; /**< Human-readable OR name. */
uint32_t addr; /**< IPv4 address of OR, in host order. */
@@ -2120,7 +2122,8 @@ typedef struct {
crypto_pk_t *identity_pkey; /**< Public RSA key for signing. */
/** Public curve25519 key for onions */
curve25519_public_key_t *onion_curve25519_pkey;
- /** Certificate for ed25519 signing key */
+ /** Certificate for ed25519 signing key
+ * (XXXX duplicated in cache_info.) */
struct tor_cert_st *signing_key_cert;
/** What's the earliest expiration time on all the certs in this
* routerinfo? */
@@ -2197,7 +2200,8 @@ typedef struct extrainfo_t {
uint8_t digest256[DIGEST256_LEN];
/** The router's nickname. */
char nickname[MAX_NICKNAME_LEN+1];
- /** Certificate for ed25519 signing key */
+ /** Certificate for ed25519 signing key
+ * (XXXX duplicated in cache_info.) */
struct tor_cert_st *signing_key_cert;
/** True iff we found the right key for this extra-info, verified the
* signature, and found it to be bad. */