commit 1e4e9db8157e8691327fe9ee9de5df6fe9891040
parent b8ae4111e38bc9cf6ac395b78601c150f710936f
Author: Nick Mathewson <nickm@torproject.org>
Date: Fri, 15 Jun 2018 14:14:11 -0400
Extract authority_cert_t into its own header
Diffstat:
13 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/src/or/authority_cert_st.h b/src/or/authority_cert_st.h
@@ -0,0 +1,30 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2017, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+#ifndef AUTHORITY_CERT_ST_H
+#define AUTHORITY_CERT_ST_H
+
+/** Certificate for v3 directory protocol: binds long-term authority identity
+ * keys to medium-term authority signing keys. */
+struct authority_cert_t {
+ /** Information relating to caching this cert on disk and looking it up. */
+ signed_descriptor_t cache_info;
+ /** This authority's long-term authority identity key. */
+ crypto_pk_t *identity_key;
+ /** This authority's medium-term signing key. */
+ crypto_pk_t *signing_key;
+ /** The digest of <b>signing_key</b> */
+ char signing_key_digest[DIGEST_LEN];
+ /** The listed expiration time of this certificate. */
+ time_t expires;
+ /** This authority's IPv4 address, in host order. */
+ uint32_t addr;
+ /** This authority's directory port. */
+ uint16_t dir_port;
+};
+
+#endif
+
diff --git a/src/or/dirauth/dirvote.c b/src/or/dirauth/dirvote.c
@@ -28,6 +28,7 @@
#include "dirauth/mode.h"
#include "dirauth/shared_random_state.h"
+#include "authority_cert_st.h"
#include "dir_server_st.h"
#include "document_signature_st.h"
#include "networkstatus_st.h"
diff --git a/src/or/dirauth/shared_random.c b/src/or/dirauth/shared_random.c
@@ -105,6 +105,7 @@
#include "dirauth/dirvote.h"
#include "dirauth/mode.h"
+#include "authority_cert_st.h"
#include "networkstatus_st.h"
/* String prefix of shared random values in votes/consensuses. */
diff --git a/src/or/directory.c b/src/or/directory.c
@@ -54,6 +54,7 @@
#include "dirauth/mode.h"
#include "dirauth/shared_random.h"
+#include "authority_cert_st.h"
#include "dir_connection_st.h"
#include "dir_server_st.h"
#include "entry_connection_st.h"
diff --git a/src/or/include.am b/src/or/include.am
@@ -181,6 +181,7 @@ endif
ORHEADERS = \
src/or/addressmap.h \
+ src/or/authority_cert_st.h \
src/or/auth_dirs.inc \
src/or/bridges.h \
src/or/channel.h \
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
@@ -74,6 +74,7 @@
#include "dirauth/mode.h"
#include "dirauth/shared_random.h"
+#include "authority_cert_st.h"
#include "dir_connection_st.h"
#include "dir_server_st.h"
#include "document_signature_st.h"
diff --git a/src/or/or.h b/src/or/or.h
@@ -1911,24 +1911,7 @@ typedef struct extend_info_t {
curve25519_public_key_t curve25519_onion_key;
} extend_info_t;
-/** Certificate for v3 directory protocol: binds long-term authority identity
- * keys to medium-term authority signing keys. */
-typedef struct authority_cert_t {
- /** Information relating to caching this cert on disk and looking it up. */
- signed_descriptor_t cache_info;
- /** This authority's long-term authority identity key. */
- crypto_pk_t *identity_key;
- /** This authority's medium-term signing key. */
- crypto_pk_t *signing_key;
- /** The digest of <b>signing_key</b> */
- char signing_key_digest[DIGEST_LEN];
- /** The listed expiration time of this certificate. */
- time_t expires;
- /** This authority's IPv4 address, in host order. */
- uint32_t addr;
- /** This authority's directory port. */
- uint16_t dir_port;
-} authority_cert_t;
+typedef struct authority_cert_t authority_cert_t;
/** Bitfield enum type listing types of information that directory authorities
* can be authoritative about, and that directory caches may or may not cache.
diff --git a/src/or/router.c b/src/or/router.c
@@ -39,6 +39,7 @@
#include "dirauth/mode.h"
+#include "authority_cert_st.h"
#include "crypt_path_st.h"
#include "dir_connection_st.h"
#include "dir_server_st.h"
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
@@ -125,6 +125,7 @@
#include "dirauth/dirvote.h"
#include "dirauth/mode.h"
+#include "authority_cert_st.h"
#include "dir_connection_st.h"
#include "dir_server_st.h"
#include "document_signature_st.h"
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
@@ -81,6 +81,7 @@
#include "dirauth/dirvote.h"
+#include "authority_cert_st.h"
#include "document_signature_st.h"
#include "networkstatus_st.h"
#include "networkstatus_voter_info_st.h"
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
@@ -45,6 +45,7 @@
#include "log_test_helpers.h"
#include "voting_schedule.h"
+#include "authority_cert_st.h"
#include "document_signature_st.h"
#include "networkstatus_st.h"
#include "networkstatus_voter_info_st.h"
diff --git a/src/test/test_dir_common.c b/src/test/test_dir_common.c
@@ -14,6 +14,7 @@
#include "test_dir_common.h"
#include "voting_schedule.h"
+#include "authority_cert_st.h"
#include "networkstatus_st.h"
#include "networkstatus_voter_info_st.h"
#include "vote_microdesc_hash_st.h"
diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
@@ -34,6 +34,7 @@
#include "dirauth/shared_random.h"
#include "statefile.h"
+#include "authority_cert_st.h"
#include "dir_connection_st.h"
#include "networkstatus_st.h"
#include "node_st.h"
