tor

commit 9e0587f806268c0ab96a73238c0409e95b0fbed6
parent a8f4f5742e89c084b96a24bd8e1add0025479f54
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 20 Sep 2017 08:36:11 -0400

Merge remote-tracking branch 'dgoulet/ticket23305_032_01'

Diffstat:
M
src/common/crypto.h
 | 
3
+++
M
src/or/hs_common.c
 | 
2
+-
M
src/or/or.h
 | 
6
+++---

3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/common/crypto.h b/src/common/crypto.h
@@ -73,6 +73,9 @@
 /** Length of our DH keys. */
 #define DH_BYTES (1024/8)
 
+/** Length of a sha1 message digest when encoded in base32 with trailing =
+ * signs removed. */
+#define BASE32_DIGEST_LEN 32
 /** Length of a sha1 message digest when encoded in base64 with trailing =
  * signs removed. */
 #define BASE64_DIGEST_LEN 27
diff --git 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
@@ -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. */