diff options
| author | Suphanat Chunhapanya <haxx.pop@gmail.com> | 2018-05-22 00:09:40 +0700 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2018-09-07 14:03:08 -0400 |
| commit | 83c8419e73a82deeecf25e4f5c24a390c80cac33 (patch) | |
| tree | 1d8bce6edf7add998152c68e7aaccd196ca454d9 /src/feature | |
| parent | 9f975e99953fa57a7c1f43ebd22cc9e602037b6d (diff) | |
| download | tor-83c8419e73a82deeecf25e4f5c24a390c80cac33.tar.gz tor-83c8419e73a82deeecf25e4f5c24a390c80cac33.zip | |
hs-v3: Rename client_pk to client_auth_pk
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/hs/hs_descriptor.c | 9 | ||||
| -rw-r--r-- | src/feature/hs/hs_descriptor.h | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/feature/hs/hs_descriptor.c b/src/feature/hs/hs_descriptor.c index be8e206c7a..0cabe50369 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 06d3bfe75e..8ce5fd6a11 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, |