diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_circuitpadding.c | 2 | ||||
| -rw-r--r-- | src/test/test_hs_client.c | 16 | ||||
| -rw-r--r-- | src/test/test_hs_service.c | 8 | ||||
| -rw-r--r-- | src/test/test_relaycrypt.c | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index 5550488d0f..914bcb97d7 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -150,7 +150,7 @@ new_fake_orcirc(channel_t *nchan, channel_t *pchan) log_warn(LD_BUG,"Circuit initialization failed"); return NULL; } - orcirc->crypto = tmp_cpath.private->crypto; + orcirc->crypto = tmp_cpath.pvt_crypto; return orcirc; } diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c index 7f5f255076..6cf0b68e98 100644 --- a/src/test/test_hs_client.c +++ b/src/test/test_hs_client.c @@ -244,13 +244,13 @@ test_e2e_rend_circuit_setup_legacy(void *arg) /* Check the digest algo */ tt_int_op( - crypto_digest_get_algorithm(or_circ->cpath->private->crypto.f_digest), + crypto_digest_get_algorithm(or_circ->cpath->pvt_crypto.f_digest), OP_EQ, DIGEST_SHA1); tt_int_op( - crypto_digest_get_algorithm(or_circ->cpath->private->crypto.b_digest), + crypto_digest_get_algorithm(or_circ->cpath->pvt_crypto.b_digest), OP_EQ, DIGEST_SHA1); - tt_assert(or_circ->cpath->private->crypto.f_crypto); - tt_assert(or_circ->cpath->private->crypto.b_crypto); + tt_assert(or_circ->cpath->pvt_crypto.f_crypto); + tt_assert(or_circ->cpath->pvt_crypto.b_crypto); /* Ensure that circ purpose was changed */ tt_int_op(or_circ->base_.purpose, OP_EQ, CIRCUIT_PURPOSE_C_REND_JOINED); @@ -316,13 +316,13 @@ test_e2e_rend_circuit_setup(void *arg) /* Check that the crypt path has prop224 algorithm parameters */ tt_int_op( - crypto_digest_get_algorithm(or_circ->cpath->private->crypto.f_digest), + crypto_digest_get_algorithm(or_circ->cpath->pvt_crypto.f_digest), OP_EQ, DIGEST_SHA3_256); tt_int_op( - crypto_digest_get_algorithm(or_circ->cpath->private->crypto.b_digest), + crypto_digest_get_algorithm(or_circ->cpath->pvt_crypto.b_digest), OP_EQ, DIGEST_SHA3_256); - tt_assert(or_circ->cpath->private->crypto.f_crypto); - tt_assert(or_circ->cpath->private->crypto.b_crypto); + tt_assert(or_circ->cpath->pvt_crypto.f_crypto); + tt_assert(or_circ->cpath->pvt_crypto.b_crypto); /* Ensure that circ purpose was changed */ tt_int_op(or_circ->base_.purpose, OP_EQ, CIRCUIT_PURPOSE_C_REND_JOINED); diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 8a22e4d590..2a6aa5c63c 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -196,13 +196,13 @@ test_e2e_rend_circuit_setup(void *arg) /* Check the digest algo */ tt_int_op( - crypto_digest_get_algorithm(or_circ->cpath->private->crypto.f_digest), + crypto_digest_get_algorithm(or_circ->cpath->pvt_crypto.f_digest), OP_EQ, DIGEST_SHA3_256); tt_int_op( - crypto_digest_get_algorithm(or_circ->cpath->private->crypto.b_digest), + crypto_digest_get_algorithm(or_circ->cpath->pvt_crypto.b_digest), OP_EQ, DIGEST_SHA3_256); - tt_assert(or_circ->cpath->private->crypto.f_crypto); - tt_assert(or_circ->cpath->private->crypto.b_crypto); + tt_assert(or_circ->cpath->pvt_crypto.f_crypto); + tt_assert(or_circ->cpath->pvt_crypto.b_crypto); /* Ensure that circ purpose was changed */ tt_int_op(or_circ->base_.purpose, OP_EQ, CIRCUIT_PURPOSE_S_REND_JOINED); diff --git a/src/test/test_relaycrypt.c b/src/test/test_relaycrypt.c index 5dc6b47d74..4bbf07c3ec 100644 --- a/src/test/test_relaycrypt.c +++ b/src/test/test_relaycrypt.c @@ -51,7 +51,7 @@ testing_circuitset_setup(const struct testcase_t *testcase) cs->origin_circ->base_.purpose = CIRCUIT_PURPOSE_C_GENERAL; for (i=0; i<3; ++i) { crypt_path_t *hop = tor_malloc_zero(sizeof(*hop)); - relay_crypto_init(&hop->private->crypto, KEY_MATERIAL[i], + relay_crypto_init(&hop->pvt_crypto, KEY_MATERIAL[i], sizeof(KEY_MATERIAL[i]), 0, 0); hop->state = CPATH_STATE_OPEN; cpath_extend_linked_list(&cs->origin_circ->cpath, hop); |