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

whitespace fixes

Browse Source
This commit is contained in:
Nick Mathewson 2016-12-14 15:41:08 -05:00
parent a675ef8eea
commit 81360c4a5f
8 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/or/hs_circuitmap.h
View File

@ -67,3 +67,4 @@ hs_circuitmap_ht *get_hs_circuitmap(void);
#endif /* TOR_UNIT_TESTS */ #endif /* TOR_UNIT_TESTS */
#endif /* TOR_HS_CIRCUITMAP_H */ #endif /* TOR_HS_CIRCUITMAP_H */

1
src/or/hs_common.h
View File

@ -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); int hs_v3_protocol_is_enabled(void);
#endif /* TOR_HS_COMMON_H */ #endif /* TOR_HS_COMMON_H */

2
src/or/hs_intropoint.c
View File

@ -232,7 +232,6 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request,
return retval; return retval;
} }
/* Return True if circuit is suitable for becoming an intro circuit. */ /* Return True if circuit is suitable for becoming an intro circuit. */
int int
hs_intro_circuit_is_suitable(const or_circuit_t *circ) 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); circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL);
return -1; return -1;
} }

6
src/or/hs_intropoint.h
View File

@ -16,8 +16,9 @@ enum hs_intro_auth_key_type {
HS_INTRO_AUTH_KEY_TYPE_ED25519 = 0x02, HS_INTRO_AUTH_KEY_TYPE_ED25519 = 0x02,
}; };
int hs_intro_received_establish_intro(or_circuit_t *circ, const uint8_t *request, int hs_intro_received_establish_intro(or_circuit_t *circ,
size_t request_len); const uint8_t *request,
size_t request_len);
MOCK_DECL(int, hs_intro_send_intro_established_cell,(or_circuit_t *circ)); 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 /* HS_INTROPOINT_PRIVATE */
#endif /* TOR_HS_INTRO_H */ #endif /* TOR_HS_INTRO_H */

4
src/or/hs_service.c
View File

@ -126,7 +126,8 @@ generate_establish_intro_cell(const uint8_t *circuit_key_material,
crypto_mac_sha3_256(mac, sizeof(mac), crypto_mac_sha3_256(mac, sizeof(mac),
circuit_key_material, circuit_key_material_len, circuit_key_material, circuit_key_material_len,
cell_bytes_tmp, 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 */ /* Write the MAC to the cell */
uint8_t *handshake_ptr = uint8_t *handshake_ptr =
hs_cell_establish_intro_getarray_handshake_mac(cell); 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 */ #endif /* TOR_UNIT_TESTS */

1
src/or/hs_service.h
View File

@ -29,3 +29,4 @@ get_establish_intro_payload(uint8_t *buf, size_t buf_len,
#endif /* HS_SERVICE_PRIVATE */ #endif /* HS_SERVICE_PRIVATE */
#endif /* TOR_HS_SERVICE_H */ #endif /* TOR_HS_SERVICE_H */

1
src/or/rendservice.c
View File

@ -4484,3 +4484,4 @@ rend_service_non_anonymous_mode_enabled(const or_options_t *options)
tor_assert(rend_service_non_anonymous_mode_consistent(options)); tor_assert(rend_service_non_anonymous_mode_consistent(options));
return options->HiddenServiceNonAnonymousMode ? 1 : 0; return options->HiddenServiceNonAnonymousMode ? 1 : 0;
} }

1
src/test/test_hs_service.c
View File

@ -106,7 +106,6 @@ struct testcase_t hs_service_tests[] = {
{ "gen_establish_intro_cell_bad", test_gen_establish_intro_cell_bad, TT_FORK, { "gen_establish_intro_cell_bad", test_gen_establish_intro_cell_bad, TT_FORK,
NULL, NULL }, NULL, NULL },
END_OF_TESTCASES END_OF_TESTCASES
}; };