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 | |
| 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
| -rw-r--r-- | src/lib/crypt_ops/crypto_dh_nss.c | 2 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto_rand.c | 2 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto_rsa_nss.c | 2 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto_s2k.c | 2 | ||||
| -rw-r--r-- | src/lib/tls/x509_nss.c | 2 |
5 files changed, 10 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; 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 diff --git a/src/lib/crypt_ops/crypto_rsa_nss.c b/src/lib/crypt_ops/crypto_rsa_nss.c index 932e9b8685..bda35ec1ea 100644 --- a/src/lib/crypt_ops/crypto_rsa_nss.c +++ b/src/lib/crypt_ops/crypto_rsa_nss.c @@ -23,9 +23,11 @@ #include <string.h> +DISABLE_GCC_WARNING("-Wstrict-prototypes") #include <keyhi.h> #include <pk11pub.h> #include <secder.h> +ENABLE_GCC_WARNING("-Wstrict-prototypes") #ifdef ENABLE_OPENSSL #include <openssl/rsa.h> diff --git a/src/lib/crypt_ops/crypto_s2k.c b/src/lib/crypt_ops/crypto_s2k.c index de42efe5eb..ae781f24ef 100644 --- a/src/lib/crypt_ops/crypto_s2k.c +++ b/src/lib/crypt_ops/crypto_s2k.c @@ -26,7 +26,9 @@ #include <openssl/evp.h> #endif #ifdef ENABLE_NSS +DISABLE_GCC_WARNING("-Wstrict-prototypes") #include <pk11pub.h> +ENABLE_GCC_WARNING("-Wstrict-prototypes") #endif #if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_LIBSCRYPT_SCRYPT) diff --git a/src/lib/tls/x509_nss.c b/src/lib/tls/x509_nss.c index f29f946114..1034d1c39d 100644 --- a/src/lib/tls/x509_nss.c +++ b/src/lib/tls/x509_nss.c @@ -20,11 +20,13 @@ #include "lib/encoding/time_fmt.h" #include "lib/string/printf.h" +DISABLE_GCC_WARNING("-Wstrict-prototypes") #include <pk11pub.h> #include <cryptohi.h> #include <cert.h> #include <keyhi.h> #include <time.h> +ENABLE_GCC_WARNING("-Wstrict-prototypes") /* Units of PRTime per second. * |