From 459382986102dd1bd84bca24a0fddfe04efefd76 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 5 Jul 2018 15:04:18 -0400 Subject: Remove util.h Inline its contents (which were all includes) into or.h, and some of its contents into other places that didn't include or.h at all. --- src/or/keypin.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'src/or/keypin.c') diff --git a/src/or/keypin.c b/src/or/keypin.c index 34cf64f5c4..a2f3654b82 100644 --- a/src/or/keypin.c +++ b/src/or/keypin.c @@ -11,17 +11,28 @@ #define KEYPIN_PRIVATE #include "orconfig.h" + +#include "lib/cc/torint.h" #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_format.h" +#include "lib/crypt_ops/crypto_format.h" +#include "lib/ctime/di_ops.h" #include "lib/ctime/di_ops.h" +#include "lib/encoding/binascii.h" +#include "lib/encoding/time_fmt.h" +#include "lib/fdio/fdio.h" +#include "lib/fs/files.h" +#include "lib/fs/mmap.h" +#include "lib/log/torlog.h" +#include "lib/log/util_bug.h" +#include "lib/string/compat_ctype.h" +#include "lib/string/printf.h" +#include "lib/wallclock/approx_time.h" + #include "ht.h" #include "or/keypin.h" + #include "siphash.h" -#include "lib/cc/torint.h" -#include "lib/log/torlog.h" -#include "lib/fdio/fdio.h" -#include "common/util.h" -#include "lib/encoding/binascii.h" #ifdef HAVE_UNISTD_H #include @@ -34,6 +45,10 @@ #include #endif +#include +#include +#include + /** * @file keypin.c * @brief Key-pinning for RSA and Ed25519 identity keys at directory -- cgit v1.2.3-54-g00ecf