diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-29 11:41:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-29 12:21:52 -0400 |
| commit | 666e3e5ec681971b8cbf49294426208d9e83f3bd (patch) | |
| tree | c2a51b917237ab63446c65f39eef694ce4921a20 /src/tools | |
| parent | 4212a135e1c092a16fc1c4d783495e44d48bbaf9 (diff) | |
| download | tor-666e3e5ec681971b8cbf49294426208d9e83f3bd.tar.gz tor-666e3e5ec681971b8cbf49294426208d9e83f3bd.zip | |
Stop using util.h and compat.h in src/tools
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tor-gencert.c | 17 | ||||
| -rw-r--r-- | src/tools/tor-resolve.c | 11 |
2 files changed, 17 insertions, 11 deletions
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index dd2a3ea630..ce032ed643 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -13,7 +13,7 @@ #include <unistd.h> #endif -#include "common/compat.h" +#include "lib/cc/compat_compiler.h" /* Some versions of OpenSSL declare X509_STORE_CTX_set_verify_cb twice in * x509.h and x509_vfy.h. Suppress the GCC warning so we can build with @@ -30,19 +30,20 @@ DISABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls) #include <errno.h> -#if 0 -#include <stdlib.h> -#include <stdarg.h> -#endif -#include "common/util.h" -#include "lib/log/torlog.h" #include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "lib/net/address.h" #include "lib/encoding/binascii.h" +#include "lib/encoding/time_fmt.h" +#include "lib/fs/files.h" +#include "lib/log/torlog.h" +#include "lib/malloc/util_malloc.h" +#include "lib/net/address.h" +#include "lib/net/ipv4.h" +#include "lib/string/compat_string.h" +#include "lib/string/printf.h" #define IDENTITY_KEY_BITS 3072 #define SIGNING_KEY_BITS 2048 diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 408803462b..303c7af3ee 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -4,11 +4,16 @@ /* See LICENSE for licensing information */ #include "orconfig.h" -#include "common/compat.h" -#include "common/util.h" -#include "lib/net/address.h" + +#include "lib/arch/bytes.h" #include "lib/log/torlog.h" +#include "lib/malloc/util_malloc.h" +#include "lib/net/address.h" +#include "lib/net/resolve.h" +#include "lib/net/socket.h" #include "lib/sandbox/sandbox.h" +#include "lib/string/util_string.h" + #include "common/socks5_status.h" #include <stdio.h> |