diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-07-05 15:42:55 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-07-05 15:42:55 -0400 |
commit | 02ba0a2dbbe1032b56d0ba17468f2ee0d95e4f1b (patch) | |
tree | eb0ec8b0dc6c1b803033e663558cc2a7542152ac /src/or/keypin.c | |
parent | 3d610363eff2fe70d3775a66a97f844956480141 (diff) | |
parent | f7eff3008d33fb0c35986cbc14799b0127e8ab73 (diff) | |
download | tor-02ba0a2dbbe1032b56d0ba17468f2ee0d95e4f1b.tar.gz tor-02ba0a2dbbe1032b56d0ba17468f2ee0d95e4f1b.zip |
Merge branch 'destroy_common'
Diffstat (limited to 'src/or/keypin.c')
-rw-r--r-- | src/or/keypin.c | 25 |
1 files changed, 20 insertions, 5 deletions
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 <unistd.h> @@ -34,6 +45,10 @@ #include <io.h> #endif +#include <errno.h> +#include <string.h> +#include <stdlib.h> + /** * @file keypin.c * @brief Key-pinning for RSA and Ed25519 identity keys at directory |