Extract authority_cert_t into its own header

diff --git a/src/or/authority_cert_st.h b/src/or/authority_cert_st.h
new file mode 100644 (file)
index 0000000..b1dbcdd
--- /dev/null
+++ 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
index 1f95b985c07a254f59b228ee99566c0fb3b20af7..29134868c89bb3990dd9dfdfe49ccb8831208775 100644 (file)
--- 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
index 137f695dbed0b87f7199ace92bda490c60eb2b21..c042acda1bd51fa5f83b8537b3a76ca5306f714e 100644 (file)
--- 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
index b5a07f6b3e475185b6b3eba278d8243495af6515..f3080bc1f1391409f40c1cbc741a9c4cea009668 100644 (file)
--- 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
index 396cfea5ab4f0efdd0f97f37f4a3c53313bda9ba..e73432d3cf1bbc1e77e3bbad93a1c7763488026c 100644 (file)
--- 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
index 6f7223b60ae2eef64cbfeae4be28f002e2b7f27e..1951414a8abd7844be396ac241a72bdcdd7203ac 100644 (file)
--- 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
index a8ddcd24065d27617ed703aba83cb8a24c3cfe90..1f7c4be507e66321a3b32c9b81c93b8a8e9c426a 100644 (file)
--- 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
index 6d8f61d7164c8fd1084bec486d0100f184080a78..961fab12901c43ce7616c56434e3e029c2b70155 100644 (file)
--- 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
index 102f3125a4b78cb1a913b527c1d1c0f60942fd64..3170ce6017116593a22b01fc249908ed55e0df35 100644 (file)
--- 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
index ea1320de78b359c20b94843af794c00439fedc8f..34c851a1b5c0670f7754fdd80a1d427dce2c532e 100644 (file)
--- 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
index 9412f879dd9f75276478dc3d13334f4e3fec6d31..ecce489423c9c8e80116d8461c59757eb6d7d783 100644 (file)
--- 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
index 3fad1c3af07d6890e3027bc0aacd2ee68e01448b..c23282ba851ba89ea276e333816d4e3378c97bc9 100644 (file)
--- 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
index 45d63a8061c214d11e1183bfea3277f0c608620b..1c2ba9d67330752d64cbe6c78691d5c983195082 100644 (file)
--- 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"