[tor-commits] [tor/release-0.4.3] Trivial bugfixes found during TROVE investigation.

[nickm at torproject.org]

commit c940b7cf13d8ceb5705d52c215256e1de5a4e757
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Feb 10 16:35:40 2020 +0200

    Trivial bugfixes found during TROVE investigation.
---
 src/feature/hs/hs_client.c         | 6 +++---
 src/lib/crypt_ops/crypto_ed25519.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c
index fd2d26645..0efe9fc28 100644
--- a/src/feature/hs/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@ -1275,7 +1275,7 @@ hs_client_decode_descriptor(const char *desc_str,
   uint8_t subcredential[DIGEST256_LEN];
   ed25519_public_key_t blinded_pubkey;
   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(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. */
   client_auth = find_client_auth(service_identity_pk);
   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 */
@@ -1297,7 +1297,7 @@ hs_client_decode_descriptor(const char *desc_str,
 
   /* Parse descriptor */
   ret = hs_desc_decode_descriptor(desc_str, subcredential,
-                                  client_auht_sk, desc);
+                                  client_auth_sk, desc);
   memwipe(subcredential, 0, sizeof(subcredential));
   if (ret < 0) {
     goto err;
diff --git a/src/lib/crypt_ops/crypto_ed25519.c b/src/lib/crypt_ops/crypto_ed25519.c
index 400f96389..0a442bb73 100644
--- a/src/lib/crypt_ops/crypto_ed25519.c
+++ b/src/lib/crypt_ops/crypto_ed25519.c
@@ -795,7 +795,7 @@ ed25519_point_is_identity_element(const uint8_t *point)
 int
 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 */
   if (ed25519_point_is_identity_element(pubkey->pubkey)) {