nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make check-spaces happy

Browse Source
This commit is contained in:
Sebastian Hahn 2010-10-14 17:54:45 +02:00
parent 4556f2e7c8
commit 9bed40eb10
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/tortls.c
View File

@ -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);

2
src/or/nodelist.c
View File

@ -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;
}

11
src/or/policies.c
View File

@ -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". */

3
src/or/routerlist.c
View File

@ -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)
{

1
src/test/test_microdesc.c
View File

@ -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