mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'tor-github/pr/1973'

Browse source
This commit is contained in:
George Kadianakis 2020-07-07 15:34:14 +03:00
commit 86fdddccb2
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/test/test-memwipe.c
View file

@ -30,8 +30,8 @@ const char *s = NULL;
#define BUF_LEN 2048
#define FILL_BUFFER_IMPL() \
do { \
unsigned int i; \
unsigned sum = 0; \
\
/* Fill up a 1k buffer with a recognizable pattern. */ \
for (i = 0; i < BUF_LEN; i += strlen(s)) { \
@ -42,7 +42,8 @@ const char *s = NULL;
/* optimized away. */ \
for (i = 0; i < BUF_LEN; ++i) { \
sum += (unsigned char)buf[i]; \
}
} \
} while (0)
#ifdef OpenBSD
/* Disable some of OpenBSD's malloc protections for this test. This helps
@ -55,7 +56,8 @@ static unsigned
fill_a_buffer_memset(void)
{
char buf[BUF_LEN];
FILL_BUFFER_IMPL()
unsigned sum = 0;
FILL_BUFFER_IMPL();
memset(buf, 0, sizeof(buf));
return sum;
}
@ -64,7 +66,8 @@ static unsigned
fill_a_buffer_memwipe(void)
{
char buf[BUF_LEN];
FILL_BUFFER_IMPL()
unsigned sum = 0;
FILL_BUFFER_IMPL();
memwipe(buf, 0, sizeof(buf));
return sum;
}
@ -73,7 +76,8 @@ static unsigned
fill_a_buffer_nothing(void)
{
char buf[BUF_LEN];
FILL_BUFFER_IMPL()
unsigned sum = 0;
FILL_BUFFER_IMPL();
return sum;
}
@ -116,7 +120,8 @@ static unsigned
fill_heap_buffer_memset(void)
{
char *buf = heap_buf = raw_malloc(BUF_LEN);
FILL_BUFFER_IMPL()
unsigned sum = 0;
FILL_BUFFER_IMPL();
memset(buf, 0, BUF_LEN);
raw_free(buf);
return sum;
@ -126,7 +131,8 @@ static unsigned
fill_heap_buffer_memwipe(void)
{
char *buf = heap_buf = raw_malloc(BUF_LEN);
FILL_BUFFER_IMPL()
unsigned sum = 0;
FILL_BUFFER_IMPL();
memwipe(buf, 0, BUF_LEN);
raw_free(buf);
return sum;
@ -136,7 +142,8 @@ static unsigned
fill_heap_buffer_nothing(void)
{
char *buf = heap_buf = raw_malloc(BUF_LEN);
FILL_BUFFER_IMPL()
unsigned sum = 0;
FILL_BUFFER_IMPL();
raw_free(buf);
return sum;
}

2
src/test/test_config.c
View file

@ -6413,11 +6413,13 @@ test_config_getinfo_config_names(void *arg)
tor_free(answer);
}
#ifndef COCCI
#define CONFIG_TEST(name, flags) \
{ #name, test_config_ ## name, flags, NULL, NULL }
#define CONFIG_TEST_SETUP(suffix, name, flags, setup, setup_data) \
{ #name#suffix, test_config_ ## name, flags, setup, setup_data }
#endif
struct testcase_t config_tests[] = {
CONFIG_TEST(adding_trusted_dir_server, TT_FORK),