diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-06-29 10:41:36 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-06-29 10:41:36 -0400 |
| commit | f2647295c0629abcfc76849747da87cb12ed4d8b (patch) | |
| tree | 33e069ea095b5c677775849d65954f7833fdb50b /src/lib/crypt_ops/crypto_dh_nss.c | |
| parent | 45c8d69cbbde06cc8046e7f1fce25a5aee049d4e (diff) | |
| parent | fce99957e238706912a6e940c878648b6ebd8f2b (diff) | |
| download | tor-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_dh_nss.c')
| -rw-r--r-- | src/lib/crypt_ops/crypto_dh_nss.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/crypt_ops/crypto_dh_nss.c b/src/lib/crypt_ops/crypto_dh_nss.c index 793a774a8a..e0bed5c7e7 100644 --- a/src/lib/crypt_ops/crypto_dh_nss.c +++ b/src/lib/crypt_ops/crypto_dh_nss.c @@ -17,9 +17,11 @@ #include "lib/log/util_bug.h" #include "lib/malloc/malloc.h" +DISABLE_GCC_WARNING("-Wstrict-prototypes") #include <cryptohi.h> #include <keyhi.h> #include <pk11pub.h> +ENABLE_GCC_WARNING("-Wstrict-prototypes") static int dh_initialized = 0; static SECKEYDHParams tls_dh_param, circuit_dh_param; |