aboutsummaryrefslogtreecommitdiff
path: root/src/test/test-memwipe.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-05 15:04:18 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-05 15:04:18 -0400
commit459382986102dd1bd84bca24a0fddfe04efefd76 (patch)
tree2c0de91fc434a812acf9ce3bfccb93cb2f306fa2 /src/test/test-memwipe.c
parent0adcfbc7c8b579ebfe4c16c86700e8b466fc9a56 (diff)
downloadtor-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/test/test-memwipe.c')
-rw-r--r--src/test/test-memwipe.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 552cbbc551..8a4610e904 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -2,14 +2,16 @@
/* See LICENSE for licensing information */
#include "orconfig.h"
+#include "lib/crypt_ops/crypto_util.h"
+
+#include "lib/intmath/cmp.h"
+#include "lib/malloc/util_malloc.h"
+
#include <string.h>
#include <stdio.h>
#include <sys/types.h>
#include <stdlib.h>
-#include "lib/crypt_ops/crypto_util.h"
-#include "common/util.h"
-
static unsigned fill_a_buffer_memset(void) __attribute__((noinline));
static unsigned fill_a_buffer_memwipe(void) __attribute__((noinline));
static unsigned fill_a_buffer_nothing(void) __attribute__((noinline));
@@ -214,4 +216,3 @@ main(int argc, char **argv)
return 0;
}
}
-