commit 83c8419e73a82deeecf25e4f5c24a390c80cac33 Author: Suphanat Chunhapanya haxx.pop@gmail.com Date: Tue May 22 00:09:40 2018 +0700
hs-v3: Rename client_pk to client_auth_pk
Signed-off-by: David Goulet dgoulet@torproject.org --- src/feature/hs/hs_descriptor.c | 9 +++++---- src/feature/hs/hs_descriptor.h | 3 ++- src/test/test_hs_descriptor.c | 12 ++++++------ 3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/feature/hs/hs_descriptor.c b/src/feature/hs/hs_descriptor.c index be8e206c7..0cabe5036 100644 --- a/src/feature/hs/hs_descriptor.c +++ b/src/feature/hs/hs_descriptor.c @@ -2851,7 +2851,7 @@ hs_desc_build_fake_authorized_client(hs_desc_authorized_client_t *client_out) * cookie, build the auth client so we can then encode the descriptor for * publication. client_out must be already allocated. */ void -hs_desc_build_authorized_client(const curve25519_public_key_t *client_pk, +hs_desc_build_authorized_client(const curve25519_public_key_t *client_auth_pk, const curve25519_secret_key_t * auth_ephemeral_sk, const uint8_t *descriptor_cookie, @@ -2863,20 +2863,21 @@ hs_desc_build_authorized_client(const curve25519_public_key_t *client_pk, crypto_cipher_t *cipher; crypto_xof_t *xof;
- tor_assert(client_pk); + tor_assert(client_auth_pk); tor_assert(auth_ephemeral_sk); tor_assert(descriptor_cookie); tor_assert(client_out); tor_assert(!tor_mem_is_zero((char *) auth_ephemeral_sk, sizeof(*auth_ephemeral_sk))); - tor_assert(!tor_mem_is_zero((char *) client_pk, sizeof(*client_pk))); + tor_assert(!tor_mem_is_zero((char *) client_auth_pk, + sizeof(*client_auth_pk))); tor_assert(!tor_mem_is_zero((char *) descriptor_cookie, HS_DESC_DESCRIPTOR_COOKIE_LEN));
/* Calculate x25519(hs_y, client_X) */ curve25519_handshake(secret_seed, auth_ephemeral_sk, - client_pk); + client_auth_pk);
/* Calculate KEYS = KDF(SECRET_SEED, 40) */ xof = crypto_xof_new(); diff --git a/src/feature/hs/hs_descriptor.h b/src/feature/hs/hs_descriptor.h index 06d3bfe75..8ce5fd6a1 100644 --- a/src/feature/hs/hs_descriptor.h +++ b/src/feature/hs/hs_descriptor.h @@ -304,7 +304,8 @@ link_specifier_t *hs_desc_lspec_to_trunnel(
void hs_desc_build_fake_authorized_client(hs_desc_authorized_client_t *client_out); -void hs_desc_build_authorized_client(const curve25519_public_key_t *client_pk, +void hs_desc_build_authorized_client(const curve25519_public_key_t * + client_auth_pk, const curve25519_secret_key_t * auth_ephemeral_sk, const uint8_t *descriptor_cookie, diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 50a073b41..de977599a 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -868,7 +868,7 @@ test_build_authorized_client(void *arg) uint8_t descriptor_cookie[HS_DESC_DESCRIPTOR_COOKIE_LEN]; curve25519_secret_key_t auth_ephemeral_sk; curve25519_secret_key_t client_auth_sk; - curve25519_public_key_t client_pk; + curve25519_public_key_t client_auth_pk; const char ephemeral_sk_b16[] = "d023b674d993a5c8446bd2ca97e9961149b3c0e88c7dc14e8777744dd3468d6a"; const char descriptor_cookie_b16[] = @@ -884,7 +884,7 @@ test_build_authorized_client(void *arg)
ret = curve25519_secret_key_generate(&client_auth_sk, 0); tt_int_op(ret, OP_EQ, 0); - curve25519_public_key_generate(&client_pk, &client_auth_sk); + curve25519_public_key_generate(&client_auth_pk, &client_auth_sk);
desc_client = tor_malloc_zero(sizeof(hs_desc_authorized_client_t));
@@ -898,15 +898,15 @@ test_build_authorized_client(void *arg) descriptor_cookie_b16, strlen(descriptor_cookie_b16));
- base16_decode((char *) &client_pk, - sizeof(client_pk), + base16_decode((char *) &client_auth_pk, + sizeof(client_auth_pk), client_pubkey_b16, strlen(client_pubkey_b16));
MOCK(crypto_strongest_rand, mock_crypto_strongest_rand);
- hs_desc_build_authorized_client(&client_pk, &auth_ephemeral_sk, - descriptor_cookie, desc_client); + hs_desc_build_authorized_client(&client_auth_pk, &auth_ephemeral_sk, + descriptor_cookie, desc_client);
test_memeq_hex((char *) desc_client->client_id, "b514ef67192cad5f");