diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-20 08:36:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-20 08:36:11 -0400 |
| commit | 9e0587f806268c0ab96a73238c0409e95b0fbed6 (patch) | |
| tree | 4c84877d2d8aebc652d6f53c8cd381a42a5e745a /src/or | |
| parent | a8f4f5742e89c084b96a24bd8e1add0025479f54 (diff) | |
| parent | 5dea4b565f7295bae8c48790cc7d00a6e237fff0 (diff) | |
| download | tor-9e0587f806268c0ab96a73238c0409e95b0fbed6.tar.gz tor-9e0587f806268c0ab96a73238c0409e95b0fbed6.zip | |
Merge remote-tracking branch 'dgoulet/ticket23305_032_01'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/hs_common.c | 2 | ||||
| -rw-r--r-- | src/or/or.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 2cdfe57cd6..42c15c80d3 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -1453,7 +1453,7 @@ hs_lookup_last_hid_serv_request(routerstatus_t *hs_dir, const char *req_key_str, time_t now, int set) { - char hsdir_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1]; + char hsdir_id_base32[BASE32_DIGEST_LEN + 1]; char *hsdir_desc_comb_id = NULL; time_t *last_request_ptr; strmap_t *last_hid_serv_requests = get_last_hid_serv_requests(); diff --git a/src/or/or.h b/src/or/or.h index 4fc0e788a0..c23054c3b7 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -747,15 +747,15 @@ typedef enum { #define REND_NUMBER_OF_CONSECUTIVE_REPLICAS 3 /** Length of v2 descriptor ID (32 base32 chars = 160 bits). */ -#define REND_DESC_ID_V2_LEN_BASE32 32 +#define REND_DESC_ID_V2_LEN_BASE32 BASE32_DIGEST_LEN /** Length of the base32-encoded secret ID part of versioned hidden service * descriptors. */ -#define REND_SECRET_ID_PART_LEN_BASE32 32 +#define REND_SECRET_ID_PART_LEN_BASE32 BASE32_DIGEST_LEN /** Length of the base32-encoded hash of an introduction point's * identity key. */ -#define REND_INTRO_POINT_ID_LEN_BASE32 32 +#define REND_INTRO_POINT_ID_LEN_BASE32 BASE32_DIGEST_LEN /** Length of the descriptor cookie that is used for client authorization * to hidden services. */ |