diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-03-17 10:59:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-03-17 10:59:15 -0400 |
| commit | 5ecad6c95d5e8e9a0abe5c86b5f8f066cc7a8f1c (patch) | |
| tree | f632c75c417674b2a307ffd8627286973cbe2b50 /src/test/test_hs_service.c | |
| parent | 80955be6ecae7095d267981b39d10237aabc38a6 (diff) | |
| download | tor-5ecad6c95d5e8e9a0abe5c86b5f8f066cc7a8f1c.tar.gz tor-5ecad6c95d5e8e9a0abe5c86b5f8f066cc7a8f1c.zip | |
Extract the cryptographic parts of crypt_path_t and or_circuit_t.
Additionally, this change extracts the functions that created and
freed these elements.
These structures had common "forward&reverse stream&digest"
elements, but they were initialized and freed through cpath objects,
and different parts of the code depended on them. Now all that code
is extacted, and kept in relay_crypto.c
Diffstat (limited to 'src/test/test_hs_service.c')
| -rw-r--r-- | src/test/test_hs_service.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 7fade6379d..ed9f9814f0 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -173,12 +173,12 @@ test_e2e_rend_circuit_setup(void *arg) tt_int_op(retval, OP_EQ, 1); /* Check the digest algo */ - tt_int_op(crypto_digest_get_algorithm(or_circ->cpath->f_digest), + tt_int_op(crypto_digest_get_algorithm(or_circ->cpath->crypto.f_digest), OP_EQ, DIGEST_SHA3_256); - tt_int_op(crypto_digest_get_algorithm(or_circ->cpath->b_digest), + tt_int_op(crypto_digest_get_algorithm(or_circ->cpath->crypto.b_digest), OP_EQ, DIGEST_SHA3_256); - tt_assert(or_circ->cpath->f_crypto); - tt_assert(or_circ->cpath->b_crypto); + tt_assert(or_circ->cpath->crypto.f_crypto); + tt_assert(or_circ->cpath->crypto.b_crypto); /* Ensure that circ purpose was changed */ tt_int_op(or_circ->base_.purpose, OP_EQ, CIRCUIT_PURPOSE_S_REND_JOINED); |