diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-07-24 10:18:53 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-07-24 10:18:53 -0400 |
| commit | 28dfa070698f0eafe1c26a3df3dcf96488ce6635 (patch) | |
| tree | cdbe13a1731e0aaba14bb2a6c8586337ec708968 /src/feature | |
| parent | e6a9e006907cddf380d3c528757e1d41c4171884 (diff) | |
| parent | d6fd7d10352aae85ab5364efce6136b8b31108ca (diff) | |
| download | tor-28dfa070698f0eafe1c26a3df3dcf96488ce6635.tar.gz tor-28dfa070698f0eafe1c26a3df3dcf96488ce6635.zip | |
Merge branch 'maint-0.4.7'
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/hs/hs_descriptor.c | 11 | ||||
| -rw-r--r-- | src/feature/hs/hs_descriptor.h | 15 |
2 files changed, 14 insertions, 12 deletions
diff --git a/src/feature/hs/hs_descriptor.c b/src/feature/hs/hs_descriptor.c index 93fc1cf674..da7bb662e1 100644 --- a/src/feature/hs/hs_descriptor.c +++ b/src/feature/hs/hs_descriptor.c @@ -2271,7 +2271,7 @@ desc_decode_superencrypted_v3(const hs_descriptor_t *desc, hs_desc_superencrypted_data_t * desc_superencrypted_out) { - int ret = HS_DESC_DECODE_SUPERENC_ERROR; + hs_desc_decode_status_t ret = HS_DESC_DECODE_SUPERENC_ERROR; char *message = NULL; size_t message_len; memarea_t *area = NULL; @@ -2385,7 +2385,7 @@ desc_decode_encrypted_v3(const hs_descriptor_t *desc, const curve25519_secret_key_t *client_auth_sk, hs_desc_encrypted_data_t *desc_encrypted_out) { - int ret = HS_DESC_DECODE_ENCRYPTED_ERROR; + hs_desc_decode_status_t ret = HS_DESC_DECODE_ENCRYPTED_ERROR; char *message = NULL; size_t message_len; memarea_t *area = NULL; @@ -2544,7 +2544,7 @@ hs_desc_decode_encrypted(const hs_descriptor_t *desc, const curve25519_secret_key_t *client_auth_sk, hs_desc_encrypted_data_t *desc_encrypted) { - int ret = HS_DESC_DECODE_ENCRYPTED_ERROR; + hs_desc_decode_status_t ret = HS_DESC_DECODE_ENCRYPTED_ERROR; uint32_t version; tor_assert(desc); @@ -2594,7 +2594,7 @@ hs_desc_decode_superencrypted(const hs_descriptor_t *desc, hs_desc_superencrypted_data_t * desc_superencrypted) { - int ret = HS_DESC_DECODE_SUPERENC_ERROR; + hs_desc_decode_status_t ret = HS_DESC_DECODE_SUPERENC_ERROR; uint32_t version; tor_assert(desc); @@ -2644,7 +2644,8 @@ hs_desc_decode_status_t hs_desc_decode_plaintext(const char *encoded, hs_desc_plaintext_data_t *plaintext) { - int ok = 0, ret = HS_DESC_DECODE_PLAINTEXT_ERROR; + int ok = 0; + hs_desc_decode_status_t ret = HS_DESC_DECODE_PLAINTEXT_ERROR; memarea_t *area = NULL; smartlist_t *tokens = NULL; size_t encoded_len; diff --git a/src/feature/hs/hs_descriptor.h b/src/feature/hs/hs_descriptor.h index ca87972de1..22517470c1 100644 --- a/src/feature/hs/hs_descriptor.h +++ b/src/feature/hs/hs_descriptor.h @@ -292,17 +292,18 @@ MOCK_DECL(int, const uint8_t *descriptor_cookie, char **encoded_out)); -int hs_desc_decode_descriptor(const char *encoded, +hs_desc_decode_status_t hs_desc_decode_descriptor(const char *encoded, const hs_subcredential_t *subcredential, const curve25519_secret_key_t *client_auth_sk, hs_descriptor_t **desc_out); -int hs_desc_decode_plaintext(const char *encoded, +hs_desc_decode_status_t hs_desc_decode_plaintext(const char *encoded, hs_desc_plaintext_data_t *plaintext); -int hs_desc_decode_superencrypted(const hs_descriptor_t *desc, - hs_desc_superencrypted_data_t *desc_out); -int hs_desc_decode_encrypted(const hs_descriptor_t *desc, - const curve25519_secret_key_t *client_auth_sk, - hs_desc_encrypted_data_t *desc_out); +hs_desc_decode_status_t hs_desc_decode_superencrypted( + const hs_descriptor_t *desc, + hs_desc_superencrypted_data_t *desc_out); +hs_desc_decode_status_t hs_desc_decode_encrypted(const hs_descriptor_t *desc, + const curve25519_secret_key_t *client_auth_sk, + hs_desc_encrypted_data_t *desc_out); size_t hs_desc_obj_size(const hs_descriptor_t *data); size_t hs_desc_plaintext_obj_size(const hs_desc_plaintext_data_t *data); |