Merge branch 'maint-0.3.1' into release-0.3.1
This commit is contained in:
commit
cf0124b238
|
@ -167,7 +167,7 @@ desc_intro_point_free(hs_desc_intro_point_t *ip)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 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) {
|
||||||
|
|
|
@ -235,6 +235,8 @@ STATIC int desc_sig_is_valid(const char *b64_sig,
|
||||||
STATIC void desc_intro_point_free(hs_desc_intro_point_t *ip);
|
STATIC void desc_intro_point_free(hs_desc_intro_point_t *ip);
|
||||||
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 */
|
||||||
|
|
|
@ -574,7 +574,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
|
||||||
|
|
Loading…
Reference in New Issue