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

Merge remote-tracking branch 'dgoulet/bug23319_032_01'

Browse Source
This commit is contained in:
Nick Mathewson 2017-08-24 16:23:57 -04:00
commit f9cd870f50
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/hs_descriptor.c
View File

@ -147,7 +147,7 @@ static token_rule_t hs_desc_intro_point_v3_token_table[] = {
}; };
/* Free the content of the plaintext section of a descriptor. */ /* Free the content of the plaintext section of a descriptor. */
static void STATIC void
desc_plaintext_data_free_contents(hs_desc_plaintext_data_t *desc) desc_plaintext_data_free_contents(hs_desc_plaintext_data_t *desc)
{ {
if (!desc) { if (!desc) {

2
src/or/hs_descriptor.h
View File

@ -256,6 +256,8 @@ STATIC int desc_sig_is_valid(const char *b64_sig,
const char *encoded_desc, size_t encoded_len); const char *encoded_desc, size_t encoded_len);
STATIC size_t decode_superencrypted(const char *message, size_t message_len, STATIC size_t decode_superencrypted(const char *message, size_t message_len,
uint8_t **encrypted_out); uint8_t **encrypted_out);
STATIC void desc_plaintext_data_free_contents(hs_desc_plaintext_data_t *desc);
#endif /* HS_DESCRIPTOR_PRIVATE */ #endif /* HS_DESCRIPTOR_PRIVATE */
#endif /* TOR_HS_DESCRIPTOR_H */ #endif /* TOR_HS_DESCRIPTOR_H */

3
src/test/test_hs_descriptor.c
View File

@ -581,7 +581,8 @@ test_decode_bad_signature(void *arg)
expect_log_msg_containing("Malformed signature line. Rejecting."); expect_log_msg_containing("Malformed signature line. Rejecting.");
teardown_capture_of_logs(); teardown_capture_of_logs();
done: ; done:
desc_plaintext_data_free_contents(&desc_plaintext);
} }
static void static void