diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-05 15:04:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-05 15:04:18 -0400 |
| commit | 459382986102dd1bd84bca24a0fddfe04efefd76 (patch) | |
| tree | 2c0de91fc434a812acf9ce3bfccb93cb2f306fa2 /src/or/onion_ntor.c | |
| parent | 0adcfbc7c8b579ebfe4c16c86700e8b466fc9a56 (diff) | |
| download | tor-459382986102dd1bd84bca24a0fddfe04efefd76.tar.gz tor-459382986102dd1bd84bca24a0fddfe04efefd76.zip | |
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.
Diffstat (limited to 'src/or/onion_ntor.c')
| -rw-r--r-- | src/or/onion_ntor.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c index 34b1112020..59c923cb97 100644 --- a/src/or/onion_ntor.c +++ b/src/or/onion_ntor.c @@ -21,14 +21,17 @@ #include "orconfig.h" #define ONION_NTOR_PRIVATE + #include "lib/crypt_ops/crypto.h" -#include "lib/crypt_ops/crypto_hkdf.h" #include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_hkdf.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/onion_ntor.h" -#include "lib/log/torlog.h" #include "lib/ctime/di_ops.h" -#include "common/util.h" +#include "lib/log/torlog.h" +#include "lib/log/util_bug.h" +#include "or/onion_ntor.h" + +#include <string.h> /** Free storage held in an ntor handshake state. */ void |