[tor-commits] [tor/master] Whitespace fixes
nickm at torproject.org
nickm at torproject.org
Mon Sep 29 12:48:24 UTC 2014
commit b45bfba2ce3754aa8107717e638b325dd30f05ed
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Sep 29 08:48:22 2014 -0400
Whitespace fixes
---
src/or/config.c | 1 -
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 16acec7..3d9e1d2 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 32ea2f6..795c603 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. */
More information about the tor-commits
mailing list