diff options
| -rw-r--r-- | src/common/tortls.c | 3 | ||||
| -rw-r--r-- | src/or/nodelist.c | 2 | ||||
| -rw-r--r-- | src/or/policies.c | 11 | ||||
| -rw-r--r-- | src/or/routerlist.c | 3 | ||||
| -rw-r--r-- | src/test/test_microdesc.c | 1 |
5 files changed, 11 insertions, 9 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 40a7c5e9f..716cfa124 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1079,7 +1079,8 @@ void tor_tls_assert_renegotiation_unblocked(tor_tls_t *tls) { if (use_unsafe_renegotiation_flag) { - tor_assert(0 != (tls->ssl->s3->flags & SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)); + tor_assert(0 != (tls->ssl->s3->flags & + SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)); } if (use_unsafe_renegotiation_op) { long options = SSL_get_options(tls->ssl); diff --git a/src/or/nodelist.c b/src/or/nodelist.c index d1246679a..a8df30885 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -551,7 +551,6 @@ node_is_dir(const node_t *node) return 0; } - /** Return true iff <b>node</b> has either kind of usable descriptor -- that * is, a routerdecriptor or a microdescriptor. */ int @@ -726,3 +725,4 @@ node_get_declared_family(const node_t *node) else return NULL; } + diff --git a/src/or/policies.c b/src/or/policies.c index f20fe7946..b7b377b6b 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1353,14 +1353,14 @@ parse_short_policy(const char *summary) if (tor_sscanf(ent_buf, "%u-%u%c", &low, &high, &dummy) == 2) { if (low<1 || low>65535 || high<1 || high>65535) { - log_fn(LOG_PROTOCOL_WARN, LD_DIR,"Found bad entry in policy summary %s", - escaped(orig_summary)); + log_fn(LOG_PROTOCOL_WARN, LD_DIR, + "Found bad entry in policy summary %s", escaped(orig_summary)); return NULL; } } else if (tor_sscanf(ent_buf, "%u%c", &low, &dummy) == 1) { if (low<1 || low>65535) { - log_fn(LOG_PROTOCOL_WARN, LD_DIR,"Found bad entry in policy summary %s", - escaped(orig_summary)); + log_fn(LOG_PROTOCOL_WARN, LD_DIR, + "Found bad entry in policy summary %s", escaped(orig_summary)); return NULL; } high = low; @@ -1447,7 +1447,8 @@ int short_policy_is_reject_star(const short_policy_t *policy) { /* This doesn't need to be as much on the lookout as policy_is_reject_star, - * since policy summaries are from the consensus or from consensus microdescs. + * since policy summaries are from the consensus or from consensus + * microdescs. */ tor_assert(policy); /* Check for an exact match of "reject 1-65535". */ diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 816cfadf3..ccd7dc123 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2289,7 +2289,8 @@ hex_digest_nickname_matches(const char *hexdigest, const char *identity_digest, return !memcmp(digest, identity_digest, DIGEST_LEN); } -/* Return true iff <b>router</b> is listed as named in the current consensus. */ +/* Return true iff <b>router</b> is listed as named in the current + * consensus. */ static int router_is_named(const routerinfo_t *router) { diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index 821884cc7..57e894e2e 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -226,7 +226,6 @@ test_md_cache(void *data) tor_free(fn); } - struct testcase_t microdesc_tests[] = { { "cache", test_md_cache, TT_FORK, NULL, NULL }, END_OF_TESTCASES |