Expose crypto_digest_algorithm_get_length from crypto.c

Also, use it in routerparse.c

diff --git a/src/common/crypto.c b/src/common/crypto.c
index fb5dd06b5ef854cc82b0671f5717ee0c35edf2ed..4ed8bfa7e6bbc11400cae83be0312d0032dabd48 100644 (file)
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -1727,7 +1727,7 @@ crypto_digest_algorithm_parse_name(const char *name)
 }
 
 /** Given an algorithm, return the digest length in bytes. */
-static inline size_t
+size_t
 crypto_digest_algorithm_get_length(digest_algorithm_t alg)
 {
   switch (alg) {

diff --git a/src/common/crypto.h b/src/common/crypto.h
index 017c84909744b8ef11213c8ad819eae25ad0409d..ff38cca0da7c0a0e830b71d7bd26ac937a34a5dc 100644 (file)
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -233,6 +233,7 @@ void crypto_digest_smartlist(char *digest_out, size_t len_out,
                              const struct smartlist_t *lst, const char *append,
                              digest_algorithm_t alg);
 const char *crypto_digest_algorithm_get_name(digest_algorithm_t alg);
+size_t crypto_digest_algorithm_get_length(digest_algorithm_t alg);
 int crypto_digest_algorithm_parse_name(const char *name);
 crypto_digest_t *crypto_digest_new(void);
 crypto_digest_t *crypto_digest256_new(digest_algorithm_t algorithm);

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 42b05835adc4dbefbd8432f2f56601b842f7ff49..6ab042e35fa6012f836c98f25d7250c3410efe47 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -3531,10 +3531,8 @@ networkstatus_parse_detached_signatures(const char *s, const char *eos)
       continue;
     }
 
-    expected_length =
-      (alg == DIGEST_SHA1) ? HEX_DIGEST_LEN : HEX_DIGEST256_LEN;
-    digest_length =
-      (alg == DIGEST_SHA1) ? DIGEST_LEN : DIGEST256_LEN;
+    digest_length = crypto_digest_algorithm_get_length(alg);
+    expected_length = digest_length * 2; /* hex encoding */
 
     if (strlen(hexdigest) != expected_length) {
       log_warn(LD_DIR, "Wrong length on consensus-digest in detached "