|
@@ -14,6 +14,7 @@
|
|
|
#define CIRCUITBUILD_PRIVATE
|
|
|
#define CIRCUITLIST_PRIVATE
|
|
|
#define CONNECTION_PRIVATE
|
|
|
+#define CRYPT_PATH_PRIVATE
|
|
|
|
|
|
#include "test/test.h"
|
|
|
#include "test/test_helpers.h"
|
|
@@ -241,12 +242,12 @@ test_e2e_rend_circuit_setup_legacy(void *arg)
|
|
|
tt_int_op(retval, OP_EQ, 1);
|
|
|
|
|
|
/* Check the digest algo */
|
|
|
- tt_int_op(crypto_digest_get_algorithm(or_circ->cpath->crypto.f_digest),
|
|
|
+ tt_int_op(crypto_digest_get_algorithm(or_circ->cpath->private->crypto.f_digest),
|
|
|
OP_EQ, DIGEST_SHA1);
|
|
|
- tt_int_op(crypto_digest_get_algorithm(or_circ->cpath->crypto.b_digest),
|
|
|
+ tt_int_op(crypto_digest_get_algorithm(or_circ->cpath->private->crypto.b_digest),
|
|
|
OP_EQ, DIGEST_SHA1);
|
|
|
- tt_assert(or_circ->cpath->crypto.f_crypto);
|
|
|
- tt_assert(or_circ->cpath->crypto.b_crypto);
|
|
|
+ tt_assert(or_circ->cpath->private->crypto.f_crypto);
|
|
|
+ tt_assert(or_circ->cpath->private->crypto.b_crypto);
|
|
|
|
|
|
/* Ensure that circ purpose was changed */
|
|
|
tt_int_op(or_circ->base_.purpose, OP_EQ, CIRCUIT_PURPOSE_C_REND_JOINED);
|
|
@@ -311,12 +312,12 @@ test_e2e_rend_circuit_setup(void *arg)
|
|
|
tt_int_op(retval, OP_EQ, 1);
|
|
|
|
|
|
/* Check that the crypt path has prop224 algorithm parameters */
|
|
|
- tt_int_op(crypto_digest_get_algorithm(or_circ->cpath->crypto.f_digest),
|
|
|
+ tt_int_op(crypto_digest_get_algorithm(or_circ->cpath->private->crypto.f_digest),
|
|
|
OP_EQ, DIGEST_SHA3_256);
|
|
|
- tt_int_op(crypto_digest_get_algorithm(or_circ->cpath->crypto.b_digest),
|
|
|
+ tt_int_op(crypto_digest_get_algorithm(or_circ->cpath->private->crypto.b_digest),
|
|
|
OP_EQ, DIGEST_SHA3_256);
|
|
|
- tt_assert(or_circ->cpath->crypto.f_crypto);
|
|
|
- tt_assert(or_circ->cpath->crypto.b_crypto);
|
|
|
+ tt_assert(or_circ->cpath->private->crypto.f_crypto);
|
|
|
+ tt_assert(or_circ->cpath->private->crypto.b_crypto);
|
|
|
|
|
|
/* Ensure that circ purpose was changed */
|
|
|
tt_int_op(or_circ->base_.purpose, OP_EQ, CIRCUIT_PURPOSE_C_REND_JOINED);
|