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

Break some wide lines

Browse Source
This commit is contained in:
Nick Mathewson 2015-07-16 11:11:21 -04:00
parent b5cfcb2045
commit edaf681735
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/ntmain.c
View File

@ -317,7 +317,7 @@ nt_service_main(void)
case CMD_DUMP_CONFIG: case CMD_DUMP_CONFIG:
case CMD_KEYGEN: case CMD_KEYGEN:
log_err(LD_CONFIG, "Unsupported command (--list-fingerprint, " log_err(LD_CONFIG, "Unsupported command (--list-fingerprint, "
"--hash-password, --keygen, --dump-config, or --verify-config) " "--hash-password, --keygen, --dump-config, or --verify-config) "
"in NT service."); "in NT service.");
break; break;
case CMD_RUN_UNITTESTS: case CMD_RUN_UNITTESTS:

6
src/or/rendcache.h
View File

@ -48,9 +48,9 @@ typedef enum {
rend_cache_store_status_t rend_cache_store_v2_desc_as_dir(const char *desc); rend_cache_store_status_t rend_cache_store_v2_desc_as_dir(const char *desc);
rend_cache_store_status_t rend_cache_store_v2_desc_as_client(const char *desc, rend_cache_store_status_t rend_cache_store_v2_desc_as_client(const char *desc,
const char *desc_id_base32, const char *desc_id_base32,
const rend_data_t *rend_query, const rend_data_t *rend_query,
rend_cache_entry_t **entry); rend_cache_entry_t **entry);
size_t rend_cache_get_total_allocation(void); size_t rend_cache_get_total_allocation(void);
#endif /* TOR_RENDCACHE_H */ #endif /* TOR_RENDCACHE_H */

5
src/or/rendservice.c
View File

@ -3147,7 +3147,7 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc,
rend_data = rend_data_client_create(service_id, desc->desc_id, NULL, rend_data = rend_data_client_create(service_id, desc->desc_id, NULL,
REND_NO_AUTH); REND_NO_AUTH);
directory_initiate_command_routerstatus_rend(hs_dir, directory_initiate_command_routerstatus_rend(hs_dir,
DIR_PURPOSE_UPLOAD_RENDDESC_V2, DIR_PURPOSE_UPLOAD_RENDDESC_V2,
ROUTER_PURPOSE_GENERAL, ROUTER_PURPOSE_GENERAL,
DIRIND_ANONYMOUS, NULL, DIRIND_ANONYMOUS, NULL,
desc->desc_str, desc->desc_str,
@ -3660,7 +3660,8 @@ rend_consider_services_upload(time_t now)
} }
/* Does every introduction points have been established? */ /* Does every introduction points have been established? */
unsigned int intro_points_ready = unsigned int intro_points_ready =
count_established_intro_points(service) >= service->n_intro_points_wanted; count_established_intro_points(service) >=
service->n_intro_points_wanted;
if (intro_points_ready && if (intro_points_ready &&
(service->next_upload_time < now || (service->next_upload_time < now ||
(service->desc_is_dirty && (service->desc_is_dirty &&

3
src/test/test_crypto.c
View File

@ -1838,7 +1838,8 @@ struct testcase_t crypto_tests[] = {
{ "ed25519_convert", test_crypto_ed25519_convert, 0, NULL, NULL }, { "ed25519_convert", test_crypto_ed25519_convert, 0, NULL, NULL },
{ "ed25519_blinding", test_crypto_ed25519_blinding, 0, NULL, NULL }, { "ed25519_blinding", test_crypto_ed25519_blinding, 0, NULL, NULL },
{ "ed25519_testvectors", test_crypto_ed25519_testvectors, 0, NULL, NULL }, { "ed25519_testvectors", test_crypto_ed25519_testvectors, 0, NULL, NULL },
{ "ed25519_fuzz_donna", test_crypto_ed25519_fuzz_donna, TT_FORK, NULL, NULL }, { "ed25519_fuzz_donna", test_crypto_ed25519_fuzz_donna, TT_FORK, NULL,
NULL },
{ "siphash", test_crypto_siphash, 0, NULL, NULL }, { "siphash", test_crypto_siphash, 0, NULL, NULL },
END_OF_TESTCASES END_OF_TESTCASES
}; };