Loading src/or/hs_circuitmap.h +1 −0 Original line number Diff line number Diff line Loading @@ -67,3 +67,4 @@ hs_circuitmap_ht *get_hs_circuitmap(void); #endif /* TOR_UNIT_TESTS */ #endif /* TOR_HS_CIRCUITMAP_H */ src/or/hs_common.h +1 −0 Original line number Diff line number Diff line Loading @@ -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 */ src/or/hs_intropoint.c +1 −1 Original line number Diff line number Diff line Loading @@ -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) Loading Loading @@ -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; } src/or/hs_intropoint.h +4 −2 Original line number Diff line number Diff line Loading @@ -16,7 +16,8 @@ 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, 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)); Loading @@ -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 */ src/or/hs_service.c +3 −1 Original line number Diff line number Diff line Loading @@ -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); Loading Loading @@ -173,3 +174,4 @@ generate_establish_intro_cell(const uint8_t *circuit_key_material, } #endif /* TOR_UNIT_TESTS */ Loading
src/or/hs_circuitmap.h +1 −0 Original line number Diff line number Diff line Loading @@ -67,3 +67,4 @@ hs_circuitmap_ht *get_hs_circuitmap(void); #endif /* TOR_UNIT_TESTS */ #endif /* TOR_HS_CIRCUITMAP_H */
src/or/hs_common.h +1 −0 Original line number Diff line number Diff line Loading @@ -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 */
src/or/hs_intropoint.c +1 −1 Original line number Diff line number Diff line Loading @@ -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) Loading Loading @@ -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; }
src/or/hs_intropoint.h +4 −2 Original line number Diff line number Diff line Loading @@ -16,7 +16,8 @@ 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, 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)); Loading @@ -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 */
src/or/hs_service.c +3 −1 Original line number Diff line number Diff line Loading @@ -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); Loading Loading @@ -173,3 +174,4 @@ generate_establish_intro_cell(const uint8_t *circuit_key_material, } #endif /* TOR_UNIT_TESTS */