commit 681812ea40423f46c45f05d096ca01f346ff3fd9 Author: Taylor Yu catalyst@torproject.org Date: Thu Apr 6 14:49:40 2017 -0400

Use macros for base64 lengths in shared_random.h

Fixes #19564. --- src/or/shared_random.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/or/shared_random.h b/src/or/shared_random.h index ae390c4..1f027c7 100644 --- a/src/or/shared_random.h +++ b/src/or/shared_random.h @@ -36,17 +36,14 @@

/* Length of base64 encoded commit NOT including the NUL terminated byte. * Formula is taken from base64_encode_size. This adds up to 56 bytes. */ -#define SR_COMMIT_BASE64_LEN \ - (((SR_COMMIT_LEN - 1) / 3) * 4 + 4) +#define SR_COMMIT_BASE64_LEN (BASE64_LEN(SR_COMMIT_LEN)) /* Length of base64 encoded reveal NOT including the NUL terminated byte. * Formula is taken from base64_encode_size. This adds up to 56 bytes. */ -#define SR_REVEAL_BASE64_LEN \ - (((SR_REVEAL_LEN - 1) / 3) * 4 + 4) +#define SR_REVEAL_BASE64_LEN (BASE64_LEN(SR_REVEAL_LEN)) /* Length of base64 encoded shared random value. It's 32 bytes long so 44 * bytes from the base64_encode_size formula. That includes the '=' * character at the end. */ -#define SR_SRV_VALUE_BASE64_LEN \ - (((DIGEST256_LEN - 1) / 3) * 4 + 4) +#define SR_SRV_VALUE_BASE64_LEN (BASE64_LEN(DIGEST256_LEN))

/* Assert if commit valid flag is not set. */ #define ASSERT_COMMIT_VALID(c) tor_assert((c)->valid)