[tor-commits] [tor/master] Merge branch 'maint-0.4.3'

[nickm at torproject.org]

commit 270fe01557cd6f0ca3a795e4801de82a46d87e89
Merge: 44f92e8e4 bbc80ea04
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 17 11:47:35 2020 -0400

    Merge branch 'maint-0.4.3'

 changes/trove_2020_003             | 4 ++++
 src/feature/hs/hs_client.c         | 6 +++---
 src/feature/hs/hs_service.c        | 6 ++++++
 src/lib/crypt_ops/crypto_ed25519.c | 2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --cc src/feature/hs/hs_client.c
index d5c1c5ca9,af8cb0b41..cc1b01d2e
--- a/src/feature/hs/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@@ -1845,10 -1845,10 +1845,10 @@@ hs_client_decode_descriptor(const char 
                              hs_descriptor_t **desc)
  {
    hs_desc_decode_status_t ret;
 -  uint8_t subcredential[DIGEST256_LEN];
 +  hs_subcredential_t subcredential;
    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);
@@@ -1869,9 -1869,9 +1869,9 @@@
    }
  
    /* 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 != HS_DESC_DECODE_OK) {
      goto err;
    }