diff options
| author | teor <teor@torproject.org> | 2019-08-12 09:51:00 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-08-12 09:51:00 +1000 |
| commit | 224825e7ee993da72b3027558ba263dae6fcae22 (patch) | |
| tree | 54ff2beac7d3d3a8bf3a2320b9940aa86b0154a3 /src/test | |
| parent | e5be039494745a3b0d101e422aa5793aaeac3567 (diff) | |
| parent | 245dccb77d79dc432bb7aab21ce2c893da4b602a (diff) | |
| download | tor-224825e7ee993da72b3027558ba263dae6fcae22.tar.gz tor-224825e7ee993da72b3027558ba263dae6fcae22.zip | |
Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_hs_cell.c | 2 | ||||
| -rw-r--r-- | src/test/test_hs_intropoint.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test_hs_cell.c b/src/test/test_hs_cell.c index 0c93f593ce..f8af631c8b 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 660f21ffd8..558fc32c54 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); |