diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-15 10:37:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-15 10:37:55 -0400 |
| commit | eec58c35482d4425fccf38d632035319b56f795e (patch) | |
| tree | 75fe914c7fb9ecfc8602107b51e434648bd0dc74 /src | |
| parent | 7e1fa9d63e7ef6d41b78280a73f86a0b17110dfd (diff) | |
| parent | af2b6bdaba85d617f9eb93c67457f8b89b088b2d (diff) | |
| download | tor-eec58c35482d4425fccf38d632035319b56f795e.tar.gz tor-eec58c35482d4425fccf38d632035319b56f795e.zip | |
Merge remote-tracking branch 'teor/fix-spaces-20150415'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/crypto.h | 1 | ||||
| -rw-r--r-- | src/test/test-memwipe.c | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/common/crypto.h b/src/common/crypto.h index 440ff23ee8..b9c26a4551 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -296,3 +296,4 @@ struct dh_st *crypto_dh_get_dh_(crypto_dh_t *dh); void crypto_add_spaces_to_fp(char *out, size_t outlen, const char *in); #endif + diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index a721a8e728..815475a55e 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -148,8 +148,11 @@ check_heap_buffer(void) static struct testcase { const char *name; - unsigned (*fill_fn)(void); - unsigned (*check_fn)(void); + /* this spacing satisfies make check-spaces */ + unsigned + (*fill_fn)(void); + unsigned + (*check_fn)(void); } testcases[] = { { "nil", fill_a_buffer_nothing, check_a_buffer }, { "nil-heap", fill_heap_buffer_nothing, check_heap_buffer }, |