nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Expose desc_intro_point_free to the tests, and use it.

Browse Source 
Also fix another couple of leaks.
This commit is contained in:
Nick Mathewson 2016-11-04 14:21:53 -04:00
parent 6ac85ca2b4
commit a4291eef5a
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/hs_descriptor.c
View File

@ -77,7 +77,7 @@ static token_rule_t hs_desc_intro_point_v3_token_table[] = {
};
/* Free a descriptor intro point object. */
static void
STATIC void
desc_intro_point_free(hs_desc_intro_point_t *ip)
{
if (!ip) {

2
src/or/hs_descriptor.h
View File

@ -232,7 +232,7 @@ STATIC int cert_is_valid(tor_cert_t *cert, uint8_t type,
STATIC int desc_sig_is_valid(const char *b64_sig,
const ed25519_keypair_t *signing_kp,
const char *encoded_desc, size_t encoded_len);
STATIC void desc_intro_point_free(hs_desc_intro_point_t *ip);
#endif /* HS_DESCRIPTOR_PRIVATE */
#endif /* TOR_HS_DESCRIPTOR_H */

12
src/test/test_hs_descriptor.c
View File

@ -593,7 +593,7 @@ test_decode_intro_point(void *arg)
int ret;
char *encoded_ip = NULL;
size_t len_out;
hs_desc_intro_point_t *ip;
hs_desc_intro_point_t *ip = NULL;
hs_descriptor_t *desc = NULL;
(void) arg;
@ -673,6 +673,8 @@ test_decode_intro_point(void *arg)
const char *junk = "this is not a descriptor";
ip = decode_introduction_point(desc, junk);
tt_assert(!ip);
desc_intro_point_free(ip);
ip = NULL;
}
/* Invalid link specifiers. */
@ -689,6 +691,8 @@ test_decode_intro_point(void *arg)
tt_assert(!ip);
tor_free(encoded_ip);
smartlist_free(lines);
desc_intro_point_free(ip);
ip = NULL;
}
/* Invalid auth key type. */
@ -803,6 +807,7 @@ test_decode_intro_point(void *arg)
done:
hs_descriptor_free(desc);
desc_intro_point_free(ip);
}
const char encrypted_desc_portion[] = "create2-formats 2\n"
@ -1027,6 +1032,7 @@ test_validate_cert(void *arg)
int ret;
time_t now = time(NULL);
ed25519_keypair_t kp;
tor_cert_t *cert = NULL;
(void) arg;
@ -1034,7 +1040,7 @@ test_validate_cert(void *arg)
tt_int_op(ret, ==, 0);
/* Cert of type CERT_TYPE_AUTH_HS_IP_KEY. */
tor_cert_t *cert = tor_cert_create(&kp, CERT_TYPE_AUTH_HS_IP_KEY,
cert = tor_cert_create(&kp, CERT_TYPE_AUTH_HS_IP_KEY,
&kp.pubkey, now, 3600,
CERT_FLAG_INCLUDE_SIGNING_KEY);
tt_assert(cert);
@ -1062,7 +1068,7 @@ test_validate_cert(void *arg)
tt_int_op(ret, OP_EQ, 0);
done:
;
tor_cert_free(cert);
}
static void