[tor-commits] [tor/master] make stack-protector happy

nickm at torproject.org nickm at torproject.org
Thu Dec 10 16:50:07 UTC 2015


commit 4d13cc69ce6e5d29b8c8d207b86dda1584b3fac7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 10 11:50:02 2015 -0500

    make stack-protector happy
---
 src/common/crypto.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 3785074..6cef249 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -2529,7 +2529,7 @@ crypto_strongest_rand_raw(uint8_t *out, size_t out_len)
 void
 crypto_strongest_rand(uint8_t *out, size_t out_len)
 {
-  const unsigned DLEN = SHA512_DIGEST_LENGTH;
+#define DLEN SHA512_DIGEST_LENGTH
   /* We're going to hash DLEN bytes from the system RNG together with some
    * bytes from the openssl PRNG, in order to yield DLEN bytes.
    */
@@ -2558,6 +2558,7 @@ crypto_strongest_rand(uint8_t *out, size_t out_len)
   }
   memwipe(tmp, 0, sizeof(tmp));
   memwipe(inp, 0, sizeof(inp));
+#undef DLEN
 }
 
 /** Seed OpenSSL's random number generator with bytes from the operating



More information about the tor-commits mailing list