diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-12-19 09:27:35 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-12-19 09:34:18 -0500 |
| commit | 99874ecc1de43756bc5ba7f92ef8073e5d5b3c72 (patch) | |
| tree | 6cf0a3ef340da3f2ae5fc9506dc287d3ec0682b6 /src/feature/dirauth/process_descs.c | |
| parent | 9386b0b28ad7c276eaaf4546a1764c605850dba3 (diff) | |
| download | tor-99874ecc1de43756bc5ba7f92ef8073e5d5b3c72.tar.gz tor-99874ecc1de43756bc5ba7f92ef8073e5d5b3c72.zip | |
Move AuthDirPinKeys to dirauth module.
Diffstat (limited to 'src/feature/dirauth/process_descs.c')
| -rw-r--r-- | src/feature/dirauth/process_descs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index 8dae4e9335..207aae3791 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -18,6 +18,7 @@ #include "app/config/config.h" #include "core/or/policies.h" #include "core/or/versions.h" +#include "feature/dirauth/dirauth_sys.h" #include "feature/dirauth/keypin.h" #include "feature/dirauth/reachability.h" #include "feature/dirclient/dlstatus.h" @@ -32,6 +33,7 @@ #include "feature/relay/router.h" #include "core/or/tor_version_st.h" +#include "feature/dirauth/dirauth_options_st.h" #include "feature/nodelist/extrainfo_st.h" #include "feature/nodelist/node_st.h" #include "feature/nodelist/routerinfo_st.h" @@ -232,7 +234,7 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg, int severity) { char d[DIGEST_LEN]; - const int key_pinning = get_options()->AuthDirPinKeys; + const int key_pinning = dirauth_get_options()->AuthDirPinKeys; if (crypto_pk_get_digest(router->identity_pkey, d)) { log_warn(LD_BUG,"Error computing fingerprint"); @@ -666,7 +668,7 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) char *desc, *nickname; const size_t desclen = ri->cache_info.signed_descriptor_len + ri->cache_info.annotations_len; - const int key_pinning = get_options()->AuthDirPinKeys; + const int key_pinning = dirauth_get_options()->AuthDirPinKeys; *msg = NULL; /* If it's too big, refuse it now. Otherwise we'll cache it all over the |