From 81360c4a5fde6d66a81c506af657df77d2e63cff Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 14 Dec 2016 15:41:08 -0500 Subject: [PATCH] whitespace fixes --- src/or/hs_circuitmap.h | 1 + src/or/hs_common.h | 1 + src/or/hs_intropoint.c | 2 +- src/or/hs_intropoint.h | 6 ++++-- src/or/hs_service.c | 4 +++- src/or/hs_service.h | 1 + src/or/rendservice.c | 1 + src/test/test_hs_service.c | 1 - 8 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/or/hs_circuitmap.h b/src/or/hs_circuitmap.h index a2be97c029..79767dd535 100644 --- a/src/or/hs_circuitmap.h +++ b/src/or/hs_circuitmap.h @@ -67,3 +67,4 @@ hs_circuitmap_ht *get_hs_circuitmap(void); #endif /* TOR_UNIT_TESTS */ #endif /* TOR_HS_CIRCUITMAP_H */ + diff --git a/src/or/hs_common.h b/src/or/hs_common.h index 55710b7f79..8158d278df 100644 --- a/src/or/hs_common.h +++ b/src/or/hs_common.h @@ -42,3 +42,4 @@ const uint8_t *rend_data_get_pk_digest(const rend_data_t *rend_data, int hs_v3_protocol_is_enabled(void); #endif /* TOR_HS_COMMON_H */ + diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index 67355bc44b..bfc7ec3876 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -232,7 +232,6 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request, return retval; } - /* Return True if circuit is suitable for becoming an intro circuit. */ int hs_intro_circuit_is_suitable(const or_circuit_t *circ) @@ -286,3 +285,4 @@ hs_intro_received_establish_intro(or_circuit_t *circ, const uint8_t *request, circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); return -1; } + diff --git a/src/or/hs_intropoint.h b/src/or/hs_intropoint.h index b7846a4d8f..46d8d6f7de 100644 --- a/src/or/hs_intropoint.h +++ b/src/or/hs_intropoint.h @@ -16,8 +16,9 @@ enum hs_intro_auth_key_type { HS_INTRO_AUTH_KEY_TYPE_ED25519 = 0x02, }; -int hs_intro_received_establish_intro(or_circuit_t *circ, const uint8_t *request, - size_t request_len); +int hs_intro_received_establish_intro(or_circuit_t *circ, + const uint8_t *request, + size_t request_len); MOCK_DECL(int, hs_intro_send_intro_established_cell,(or_circuit_t *circ)); @@ -38,3 +39,4 @@ get_auth_key_from_establish_intro_cell(ed25519_public_key_t *auth_key_out, #endif /* HS_INTROPOINT_PRIVATE */ #endif /* TOR_HS_INTRO_H */ + diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 6f0836ca2e..3b5a3e7853 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -126,7 +126,8 @@ generate_establish_intro_cell(const uint8_t *circuit_key_material, crypto_mac_sha3_256(mac, sizeof(mac), circuit_key_material, circuit_key_material_len, cell_bytes_tmp, - encoded_len - (ED25519_SIG_LEN + 2 + TRUNNEL_SHA3_256_LEN)); + encoded_len - + (ED25519_SIG_LEN + 2 + TRUNNEL_SHA3_256_LEN)); /* Write the MAC to the cell */ uint8_t *handshake_ptr = hs_cell_establish_intro_getarray_handshake_mac(cell); @@ -173,3 +174,4 @@ generate_establish_intro_cell(const uint8_t *circuit_key_material, } #endif /* TOR_UNIT_TESTS */ + diff --git a/src/or/hs_service.h b/src/or/hs_service.h index a54a960b8c..994521fc50 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -29,3 +29,4 @@ get_establish_intro_payload(uint8_t *buf, size_t buf_len, #endif /* HS_SERVICE_PRIVATE */ #endif /* TOR_HS_SERVICE_H */ + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 9a39090ac2..00ede48fd9 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -4484,3 +4484,4 @@ rend_service_non_anonymous_mode_enabled(const or_options_t *options) tor_assert(rend_service_non_anonymous_mode_consistent(options)); return options->HiddenServiceNonAnonymousMode ? 1 : 0; } + diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 195e5069cb..8890c11da1 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -106,7 +106,6 @@ struct testcase_t hs_service_tests[] = { { "gen_establish_intro_cell_bad", test_gen_establish_intro_cell_bad, TT_FORK, NULL, NULL }, - END_OF_TESTCASES };