aboutsummaryrefslogtreecommitdiff
path: root/src/lib/crypt_ops/crypto_rand.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-06-29 10:41:36 -0400
committerDavid Goulet <dgoulet@torproject.org>2021-06-29 10:41:36 -0400
commitf2647295c0629abcfc76849747da87cb12ed4d8b (patch)
tree33e069ea095b5c677775849d65954f7833fdb50b /src/lib/crypt_ops/crypto_rand.c
parent45c8d69cbbde06cc8046e7f1fce25a5aee049d4e (diff)
parentfce99957e238706912a6e940c878648b6ebd8f2b (diff)
downloadtor-f2647295c0629abcfc76849747da87cb12ed4d8b.tar.gz
tor-f2647295c0629abcfc76849747da87cb12ed4d8b.zip
Merge branch 'maint-0.4.5' into maint-0.4.6
Diffstat (limited to 'src/lib/crypt_ops/crypto_rand.c')
-rw-r--r--src/lib/crypt_ops/crypto_rand.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c
index 83b709c623..5bf3a65b3b 100644
--- a/src/lib/crypt_ops/crypto_rand.c
+++ b/src/lib/crypt_ops/crypto_rand.c
@@ -50,9 +50,11 @@ ENABLE_GCC_WARNING("-Wredundant-decls")
#endif /* defined(ENABLE_OPENSSL) */
#ifdef ENABLE_NSS
+DISABLE_GCC_WARNING("-Wstrict-prototypes")
#include <pk11pub.h>
#include <secerr.h>
#include <prerror.h>
+ENABLE_GCC_WARNING("-Wstrict-prototypes")
#endif
#if __GNUC__ && GCC_VERSION >= 402