nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Trivial bugfixes found during TROVE investigation.

Browse Source
This commit is contained in:
George Kadianakis 2020-02-10 16:35:40 +02:00 committed by Nick Mathewson
parent 1c688ba925
commit c940b7cf13
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/feature/hs/hs_client.c
View File

@ -1275,7 +1275,7 @@ hs_client_decode_descriptor(const char *desc_str,
uint8_t subcredential[DIGEST256_LEN]; uint8_t subcredential[DIGEST256_LEN];
ed25519_public_key_t blinded_pubkey; ed25519_public_key_t blinded_pubkey;
hs_client_service_authorization_t *client_auth = NULL; hs_client_service_authorization_t *client_auth = NULL;
curve25519_secret_key_t *client_auht_sk = NULL; curve25519_secret_key_t *client_auth_sk = NULL;
tor_assert(desc_str); tor_assert(desc_str);
tor_assert(service_identity_pk); tor_assert(service_identity_pk);
@ -1284,7 +1284,7 @@ hs_client_decode_descriptor(const char *desc_str,
/* Check if we have a client authorization for this service in the map. */ /* Check if we have a client authorization for this service in the map. */
client_auth = find_client_auth(service_identity_pk); client_auth = find_client_auth(service_identity_pk);
if (client_auth) { if (client_auth) {
client_auht_sk = &client_auth->enc_seckey; client_auth_sk = &client_auth->enc_seckey;
} }
/* Create subcredential for this HS so that we can decrypt */ /* Create subcredential for this HS so that we can decrypt */
@ -1297,7 +1297,7 @@ hs_client_decode_descriptor(const char *desc_str,
/* Parse descriptor */ /* Parse descriptor */
ret = hs_desc_decode_descriptor(desc_str, subcredential, ret = hs_desc_decode_descriptor(desc_str, subcredential,
client_auht_sk, desc); client_auth_sk, desc);
memwipe(subcredential, 0, sizeof(subcredential)); memwipe(subcredential, 0, sizeof(subcredential));
if (ret < 0) { if (ret < 0) {
goto err; goto err;

2
src/lib/crypt_ops/crypto_ed25519.c
View File

@ -795,7 +795,7 @@ ed25519_point_is_identity_element(const uint8_t *point)
int int
ed25519_validate_pubkey(const ed25519_public_key_t *pubkey) ed25519_validate_pubkey(const ed25519_public_key_t *pubkey)
{ {
uint8_t result[32] = {9}; uint8_t result[32] = {0};
/* First check that we were not given the identity element */ /* First check that we were not given the identity element */
if (ed25519_point_is_identity_element(pubkey->pubkey)) { if (ed25519_point_is_identity_element(pubkey->pubkey)) {