nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Stop using util.h and compat.h in src/tools

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-29 11:41:38 -04:00
parent 4212a135e1
commit 666e3e5ec6
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/tools/tor-gencert.c
View File

@ -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

11
src/tools/tor-resolve.c
View File

@ -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>