diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-29 08:48:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-29 08:48:22 -0400 |
| commit | b45bfba2ce3754aa8107717e638b325dd30f05ed (patch) | |
| tree | bb237fbb26f9617ba1e45086f0a6b708f5fa9f3f | |
| parent | ffd92e8ef885f4a63fd09892d508674c9b4a1daf (diff) | |
| download | tor-b45bfba2ce3754aa8107717e638b325dd30f05ed.tar.gz tor-b45bfba2ce3754aa8107717e638b325dd30f05ed.zip | |
Whitespace fixes
| -rw-r--r-- | src/or/config.c | 1 | ||||
| -rw-r--r-- | src/test/test_crypto.c | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/or/config.c b/src/or/config.c index 16acec791c..3d9e1d2d4d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1676,7 +1676,6 @@ options_act(const or_options_t *old_options) connection_or_update_token_buckets(get_connection_array(), options); } - /* Only collect directory-request statistics on relays and bridges. */ options->DirReqStatistics = options->DirReqStatistics_option && server_mode(options); diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 32ea2f6c0b..795c603fd4 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1051,7 +1051,8 @@ test_crypto_pwbox(void *arg) (void)arg; for (i = 0; i < ARRAY_LENGTH(flags); ++i) { - tt_int_op(0, ==, crypto_pwbox(&boxed, &len, (const uint8_t*)msg, strlen(msg), + tt_int_op(0, ==, crypto_pwbox(&boxed, &len, + (const uint8_t*)msg, strlen(msg), pw, strlen(pw), flags[i])); tt_assert(boxed); tt_assert(len > 128+32); @@ -1065,13 +1066,16 @@ test_crypto_pwbox(void *arg) tor_free(decoded); - tt_int_op(UNPWBOX_BAD_SECRET, ==, crypto_unpwbox(&decoded, &dlen, boxed, len, + tt_int_op(UNPWBOX_BAD_SECRET, ==, crypto_unpwbox(&decoded, &dlen, + boxed, len, pw, strlen(pw)-1)); boxed[len-1] ^= 1; - tt_int_op(UNPWBOX_BAD_SECRET, ==, crypto_unpwbox(&decoded, &dlen, boxed, len, + tt_int_op(UNPWBOX_BAD_SECRET, ==, crypto_unpwbox(&decoded, &dlen, + boxed, len, pw, strlen(pw))); boxed[0] = 255; - tt_int_op(UNPWBOX_CORRUPTED, ==, crypto_unpwbox(&decoded, &dlen, boxed, len, + tt_int_op(UNPWBOX_CORRUPTED, ==, crypto_unpwbox(&decoded, &dlen, + boxed, len, pw, strlen(pw))); tor_free(boxed); @@ -1080,7 +1084,6 @@ test_crypto_pwbox(void *arg) done: tor_free(boxed); tor_free(decoded); - } /** Test AES-CTR encryption and decryption with IV. */ |