aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_hs_service.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-08-28 09:46:59 -0400
committerNick Mathewson <nickm@torproject.org>2019-08-28 09:46:59 -0400
commitb1d7ddfb02cdbd23fce0c30d6ab4897ede18e7fe (patch)
tree123e890d0e61f38d5a4ff091d7244c1a233a0ccc /src/test/test_hs_service.c
parent35e978da61efa04af9a5ab2399dff863bc6fb20a (diff)
parenta3e99c5f1e2eb9dd9ead51bcbed61dc2b99cf256 (diff)
downloadtor-b1d7ddfb02cdbd23fce0c30d6ab4897ede18e7fe.tar.gz
tor-b1d7ddfb02cdbd23fce0c30d6ab4897ede18e7fe.zip
Merge branch 'ticket31240v2' into ticket31240v2_merged_2
Diffstat (limited to 'src/test/test_hs_service.c')
-rw-r--r--src/test/test_hs_service.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index c0803a5a59..c5854f0ff8 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -1178,7 +1178,7 @@ test_introduce2(void *arg)
MOCK(get_or_state,
get_or_state_replacement);
- dummy_state = tor_malloc_zero(sizeof(or_state_t));
+ dummy_state = or_state_new();
circ = helper_create_origin_circuit(CIRCUIT_PURPOSE_S_INTRO, flags);
tt_assert(circ);
@@ -1343,7 +1343,7 @@ test_rotate_descriptors(void *arg)
(void) arg;
- dummy_state = tor_malloc_zero(sizeof(or_state_t));
+ dummy_state = or_state_new();
hs_init();
MOCK(get_or_state, get_or_state_replacement);
@@ -1460,7 +1460,7 @@ test_build_update_descriptors(void *arg)
MOCK(networkstatus_get_live_consensus,
mock_networkstatus_get_live_consensus);
- dummy_state = tor_malloc_zero(sizeof(or_state_t));
+ dummy_state = or_state_new();
ret = parse_rfc1123_time("Sat, 26 Oct 1985 03:00:00 UTC",
&mock_ns.valid_after);
@@ -1691,7 +1691,7 @@ test_build_descriptors(void *arg)
MOCK(networkstatus_get_live_consensus,
mock_networkstatus_get_live_consensus);
- dummy_state = tor_malloc_zero(sizeof(or_state_t));
+ dummy_state = or_state_new();
ret = parse_rfc1123_time("Sat, 26 Oct 1985 03:00:00 UTC",
&mock_ns.valid_after);
@@ -1792,7 +1792,7 @@ test_upload_descriptors(void *arg)
MOCK(networkstatus_get_live_consensus,
mock_networkstatus_get_live_consensus);
- dummy_state = tor_malloc_zero(sizeof(or_state_t));
+ dummy_state = or_state_new();
ret = parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC",
&mock_ns.valid_after);