aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-05-22 11:50:46 -0400
committerNick Mathewson <nickm@torproject.org>2019-05-22 11:50:46 -0400
commit24c2502070b695c047fa7ebd87ac436a98e0bb51 (patch)
tree40237c33aa442a2e4e22960096f9a4b0c915f618 /src/test
parente6b862e6a8bf690571f192efc66f06ed5cb4696d (diff)
parent245dccb77d79dc432bb7aab21ce2c893da4b602a (diff)
downloadtor-24c2502070b695c047fa7ebd87ac436a98e0bb51.tar.gz
tor-24c2502070b695c047fa7ebd87ac436a98e0bb51.zip
Merge remote-tracking branch 'dgoulet/ticket30454_035_01'
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test_hs_cell.c2
-rw-r--r--src/test/test_hs_intropoint.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test_hs_cell.c b/src/test/test_hs_cell.c
index 6e00e8807e..cdcbe23e69 100644
--- a/src/test/test_hs_cell.c
+++ b/src/test/test_hs_cell.c
@@ -50,7 +50,7 @@ test_gen_establish_intro_cell(void *arg)
/* Check the contents of the cell */
{
/* First byte is the auth key type: make sure its correct */
- tt_int_op(buf[0], OP_EQ, HS_INTRO_AUTH_KEY_TYPE_ED25519);
+ tt_int_op(buf[0], OP_EQ, TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_ED25519);
/* Next two bytes is auth key len */
tt_int_op(ntohs(get_uint16(buf+1)), OP_EQ, ED25519_PUBKEY_LEN);
/* Skip to the number of extensions: no extensions */
diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c
index b7163c5c13..732836fb5b 100644
--- a/src/test/test_hs_intropoint.c
+++ b/src/test/test_hs_intropoint.c
@@ -140,7 +140,7 @@ helper_create_introduce1_cell(void)
{
size_t auth_key_len = sizeof(auth_key_kp.pubkey);
trn_cell_introduce1_set_auth_key_type(cell,
- HS_INTRO_AUTH_KEY_TYPE_ED25519);
+ TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_ED25519);
trn_cell_introduce1_set_auth_key_len(cell, auth_key_len);
trn_cell_introduce1_setlen_auth_key(cell, auth_key_len);
uint8_t *auth_key_ptr = trn_cell_introduce1_getarray_auth_key(cell);
@@ -751,7 +751,7 @@ test_introduce1_validation(void *arg)
ret = validate_introduce1_parsed_cell(cell);
tt_int_op(ret, OP_EQ, -1);
/* Reset is to correct value and make sure it's correct. */
- cell->auth_key_type = HS_INTRO_AUTH_KEY_TYPE_ED25519;
+ cell->auth_key_type = TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_ED25519;
ret = validate_introduce1_parsed_cell(cell);
tt_int_op(ret, OP_EQ, 0);