commit e429e31ad1c3000d814f3172fcd3f7c433ee3219 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 6 20:27:43 2018 -0500

Normalize .may_include to always have paths, and paths to include --- src/lib/container/.may_include | 6 +++--- src/lib/container/bloomfilt.c | 2 +- src/lib/container/map.c | 2 +- src/lib/container/map.h | 2 +- src/lib/crypt_ops/.may_include | 4 ++-- src/lib/crypt_ops/crypto_init.c | 2 +- src/lib/crypt_ops/digestset.c | 2 +- src/lib/evloop/.may_include | 4 ++-- src/lib/evloop/timers.c | 3 ++- src/lib/evloop/workqueue.c | 2 +- src/lib/fs/.may_include | 2 +- src/lib/malloc/.may_include | 2 +- src/lib/net/.may_include | 4 ++-- src/lib/net/address.c | 2 +- src/lib/net/resolve.c | 4 ++-- src/lib/process/.may_include | 2 +- src/lib/process/waitpid.c | 2 +- src/lib/sandbox/.may_include | 6 +++--- src/lib/sandbox/sandbox.c | 6 +++--- src/lib/smartlist_core/.may_include | 2 +- src/lib/string/.may_include | 4 ++-- src/lib/string/compat_string.c | 4 ++-- src/lib/term/.may_include | 3 +-- src/lib/term/getpass.c | 2 +- src/lib/tls/.may_include | 5 ++--- src/lib/tls/tortls_openssl.c | 2 +- 26 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/src/lib/container/.may_include b/src/lib/container/.may_include index 76e584372..81507527d 100644 --- a/src/lib/container/.may_include +++ b/src/lib/container/.may_include @@ -7,9 +7,9 @@ lib/malloc/*.h lib/err/*.h lib/smartlist_core/*.h lib/string/*.h -lib/testsupport/testsupport.h +lib/testsupport/*.h lib/intmath/*.h lib/log/*.h

-ht.h -siphash.h +ext/ht.h +ext/siphash.h diff --git a/src/lib/container/bloomfilt.c b/src/lib/container/bloomfilt.c index ea2d2917c..a64fcb930 100644 --- a/src/lib/container/bloomfilt.c +++ b/src/lib/container/bloomfilt.c @@ -14,7 +14,7 @@ #include "lib/container/bloomfilt.h" #include "lib/intmath/bits.h" #include "lib/log/util_bug.h" -#include "siphash.h" +#include "ext/siphash.h"

/** How many bloom-filter bits we set per address. This is twice the * BLOOMFILT_N_HASHES value, since we split the siphash output into two 32-bit diff --git a/src/lib/container/map.c b/src/lib/container/map.c index 85e074e10..137e31692 100644 --- a/src/lib/container/map.c +++ b/src/lib/container/map.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h>

-#include "ht.h" +#include "ext/ht.h"

/** Helper: Declare an entry type and a map type to implement a mapping using * ht.h. The map type will be called <b>maptype</b>. The key part of each diff --git a/src/lib/container/map.h b/src/lib/container/map.h index ff7162268..4f427fe76 100644 --- a/src/lib/container/map.h +++ b/src/lib/container/map.h @@ -15,7 +15,7 @@ #include "lib/testsupport/testsupport.h" #include "lib/cc/torint.h"

-#include "siphash.h" +#include "ext/siphash.h"

#define DECLARE_MAP_FNS(maptype, keytype, prefix) \ typedef struct maptype maptype; \ diff --git a/src/lib/crypt_ops/.may_include b/src/lib/crypt_ops/.may_include index 352fde858..073969968 100644 --- a/src/lib/crypt_ops/.may_include +++ b/src/lib/crypt_ops/.may_include @@ -13,7 +13,7 @@ lib/intmath/*.h lib/sandbox/*.h lib/string/*.h lib/subsys/*.h -lib/testsupport/testsupport.h +lib/testsupport/*.h lib/thread/*.h lib/log/*.h

@@ -22,4 +22,4 @@ trunnel/pwbox.h keccak-tiny/*.h ed25519/*.h

-siphash.h +ext/siphash.h diff --git a/src/lib/crypt_ops/crypto_init.c b/src/lib/crypt_ops/crypto_init.c index 4c4cc3e43..f9943939f 100644 --- a/src/lib/crypt_ops/crypto_init.c +++ b/src/lib/crypt_ops/crypto_init.c @@ -24,7 +24,7 @@

#include "lib/subsys/subsys.h"

-#include "siphash.h" +#include "ext/siphash.h"

/** Boolean: has our crypto library been initialized? (early phase) */ static int crypto_early_initialized_ = 0; diff --git a/src/lib/crypt_ops/digestset.c b/src/lib/crypt_ops/digestset.c index 89dd377a9..84516e017 100644 --- a/src/lib/crypt_ops/digestset.c +++ b/src/lib/crypt_ops/digestset.c @@ -11,7 +11,7 @@ #include "lib/crypt_ops/crypto_rand.h" #include "lib/defs/digest_sizes.h" #include "lib/crypt_ops/digestset.h" -#include "siphash.h" +#include "ext/siphash.h"

/* Wrap our hash function to have the signature that the bloom filter * needs. */ diff --git a/src/lib/evloop/.may_include b/src/lib/evloop/.may_include index 30af50891..273de7bb9 100644 --- a/src/lib/evloop/.may_include +++ b/src/lib/evloop/.may_include @@ -12,5 +12,5 @@ lib/testsupport/*.h lib/thread/*.h lib/time/*.h

-src/ext/timeouts/timeout.c -tor_queue.h \ No newline at end of file +ext/timeouts/timeout.c +ext/tor_queue.h \ No newline at end of file diff --git a/src/lib/evloop/timers.c b/src/lib/evloop/timers.c index 3603bf1a7..6743b6af5 100644 --- a/src/lib/evloop/timers.c +++ b/src/lib/evloop/timers.c @@ -80,7 +80,8 @@ struct timeout_cb { * use 32-bit math. */ #define WHEEL_BIT 5 #endif -#include "src/ext/timeouts/timeout.c" + +#include "ext/timeouts/timeout.c"

static struct timeouts *global_timeouts = NULL; static struct mainloop_event_t *global_timer_event = NULL; diff --git a/src/lib/evloop/workqueue.c b/src/lib/evloop/workqueue.c index 5471f87b0..b36a02da5 100644 --- a/src/lib/evloop/workqueue.c +++ b/src/lib/evloop/workqueue.c @@ -36,7 +36,7 @@ #include "lib/net/socket.h" #include "lib/thread/threads.h"

-#include "tor_queue.h" +#include "ext/tor_queue.h" #include <event2/event.h> #include <string.h>

diff --git a/src/lib/fs/.may_include b/src/lib/fs/.may_include index b1e49fc89..c192e6181 100644 --- a/src/lib/fs/.may_include +++ b/src/lib/fs/.may_include @@ -13,4 +13,4 @@ lib/malloc/*.h lib/memarea/*.h lib/sandbox/*.h lib/string/*.h -lib/testsupport/testsupport.h +lib/testsupport/*.h diff --git a/src/lib/malloc/.may_include b/src/lib/malloc/.may_include index cc62bb101..7686bf862 100644 --- a/src/lib/malloc/.may_include +++ b/src/lib/malloc/.may_include @@ -3,4 +3,4 @@ orconfig.h lib/cc/*.h lib/err/*.h lib/malloc/*.h -lib/testsupport/testsupport.h +lib/testsupport/*.h diff --git a/src/lib/net/.may_include b/src/lib/net/.may_include index d34aaed2c..e4368f799 100644 --- a/src/lib/net/.may_include +++ b/src/lib/net/.may_include @@ -1,6 +1,6 @@ orconfig.h -siphash.h -ht.h +ext/siphash.h +ext/ht.h

lib/arch/*.h lib/buf/*.h diff --git a/src/lib/net/address.c b/src/lib/net/address.c index a351b9df2..240201d7b 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -53,7 +53,7 @@ #include "lib/string/printf.h" #include "lib/string/util_string.h"

-#include "siphash.h" +#include "ext/siphash.h"

#ifdef HAVE_SYS_TIME_H #include <sys/time.h> diff --git a/src/lib/net/resolve.c b/src/lib/net/resolve.c index 7c8df3e30..01f788296 100644 --- a/src/lib/net/resolve.c +++ b/src/lib/net/resolve.c @@ -16,8 +16,8 @@ #include "lib/string/parse_int.h" #include "lib/string/util_string.h"

-#include "siphash.h" -#include "ht.h" +#include "ext/siphash.h" +#include "ext/ht.h"

#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/src/lib/process/.may_include b/src/lib/process/.may_include index a2d57a52f..3a5d849fe 100644 --- a/src/lib/process/.may_include +++ b/src/lib/process/.may_include @@ -15,4 +15,4 @@ lib/subsys/*.h lib/testsupport/*.h lib/thread/*.h

-ht.h \ No newline at end of file +ext/ht.h \ No newline at end of file diff --git a/src/lib/process/waitpid.c b/src/lib/process/waitpid.c index 32ba4530d..46d30bf50 100644 --- a/src/lib/process/waitpid.c +++ b/src/lib/process/waitpid.c @@ -16,7 +16,7 @@ #include "lib/log/log.h" #include "lib/log/util_bug.h" #include "lib/malloc/malloc.h" -#include "ht.h" +#include "ext/ht.h"

#ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> diff --git a/src/lib/sandbox/.may_include b/src/lib/sandbox/.may_include index e8ba5bb73..853dae788 100644 --- a/src/lib/sandbox/.may_include +++ b/src/lib/sandbox/.may_include @@ -9,6 +9,6 @@ lib/sandbox/*.h lib/sandbox/*.inc lib/string/*.h

-ht.h -siphash.h -tor_queue.h +ext/ht.h +ext/siphash.h +ext/tor_queue.h diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index 4d832f106..947781855 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -41,9 +41,9 @@ #include "lib/malloc/malloc.h" #include "lib/string/scanf.h"

-#include "tor_queue.h" -#include "ht.h" -#include "siphash.h" +#include "ext/tor_queue.h" +#include "ext/ht.h" +#include "ext/siphash.h"

#define DEBUGGING_CLOSE

diff --git a/src/lib/smartlist_core/.may_include b/src/lib/smartlist_core/.may_include index a8507761a..2f0c8d341 100644 --- a/src/lib/smartlist_core/.may_include +++ b/src/lib/smartlist_core/.may_include @@ -4,4 +4,4 @@ lib/malloc/*.h lib/err/*.h lib/string/*.h lib/smartlist_core/*.h -lib/testsupport/testsupport.h +lib/testsupport/*.h diff --git a/src/lib/string/.may_include b/src/lib/string/.may_include index ec5c76983..1fb9127f1 100644 --- a/src/lib/string/.may_include +++ b/src/lib/string/.may_include @@ -6,5 +6,5 @@ lib/malloc/*.h lib/ctime/*.h lib/string/*.h

-strlcat.c -strlcpy.c +ext/strlcat.c +ext/strlcpy.c diff --git a/src/lib/string/compat_string.c b/src/lib/string/compat_string.c index eae82fdae..b3f1e0fd9 100644 --- a/src/lib/string/compat_string.c +++ b/src/lib/string/compat_string.c @@ -14,10 +14,10 @@

/* Inline the strl functions if the platform doesn't have them. */ #ifndef HAVE_STRLCPY -#include "strlcpy.c" +#include "ext/strlcpy.c" #endif #ifndef HAVE_STRLCAT -#include "strlcat.c" +#include "ext/strlcat.c" #endif

#include <stdlib.h> diff --git a/src/lib/term/.may_include b/src/lib/term/.may_include index c93a06e59..306fa57b7 100644 --- a/src/lib/term/.may_include +++ b/src/lib/term/.may_include @@ -5,5 +5,4 @@ lib/log/*.h lib/term/*.h lib/malloc/*.h

-# From src/ext -tor_readpassphrase.h +ext/tor_readpassphrase.h diff --git a/src/lib/term/getpass.c b/src/lib/term/getpass.c index 27a27179b..a473fb765 100644 --- a/src/lib/term/getpass.c +++ b/src/lib/term/getpass.c @@ -36,7 +36,7 @@ SecureZeroMemory(PVOID ptr, SIZE_T cnt) #elif defined(HAVE_READPASSPHRASE_H) #include <readpassphrase.h> #else -#include "tor_readpassphrase.h" +#include "ext/tor_readpassphrase.h" #endif /* defined(_WIN32) || ... */

#include <stdlib.h> diff --git a/src/lib/tls/.may_include b/src/lib/tls/.may_include index 069181b70..c550bde02 100644 --- a/src/lib/tls/.may_include +++ b/src/lib/tls/.may_include @@ -13,7 +13,6 @@ lib/malloc/*.h lib/net/*.h lib/string/*.h lib/subsys/*.h -lib/testsupport/testsupport.h +lib/testsupport/*.h lib/tls/*.h - -ciphers.inc +lib/tls/*.inc diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index 63f6259a6..ddeaabc41 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -461,7 +461,7 @@ static const char UNRESTRICTED_SERVER_CIPHER_LIST[] = /** List of ciphers that clients should advertise, omitting items that * our OpenSSL doesn't know about. */ static const char CLIENT_CIPHER_LIST[] = -#include "ciphers.inc" +#include "lib/tls/ciphers.inc" /* Tell it not to use SSLv2 ciphers, so that it can select an SSLv3 version * of any cipher we say. */ "!SSLv2"