diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-14 20:21:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-14 20:21:32 -0400 |
| commit | 1cdb839108ef7487aaa516ab003d1afd7abfecc6 (patch) | |
| tree | d247cb62a480433f906980e2c30d066cc2788afd | |
| parent | 299f892815bff3aea4b1b2c3bd6b925d94c37a08 (diff) | |
| parent | d6b01211b94d0f346a408eef78e04a8d0ffbb51f (diff) | |
| download | tor-1cdb839108ef7487aaa516ab003d1afd7abfecc6.tar.gz tor-1cdb839108ef7487aaa516ab003d1afd7abfecc6.zip | |
Merge branch 'maint-0.2.8' into release-0.2.8
| -rw-r--r-- | src/common/aes.c | 22 | ||||
| -rw-r--r-- | src/common/crypto.c | 21 | ||||
| -rw-r--r-- | src/test/test_microdesc.c | 21 |
3 files changed, 64 insertions, 0 deletions
diff --git a/src/common/aes.c b/src/common/aes.c index c8a17c837f..15970a73f0 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -23,6 +23,19 @@ #error "We require OpenSSL >= 1.0.0" #endif +#ifdef __GNUC__ +#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) +#endif + +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 +#pragma GCC diagnostic push +#endif +/* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in + * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */ +#pragma GCC diagnostic ignored "-Wredundant-decls" +#endif + #include <assert.h> #include <stdlib.h> #include <string.h> @@ -30,6 +43,15 @@ #include <openssl/evp.h> #include <openssl/engine.h> #include <openssl/modes.h> + +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 +#pragma GCC diagnostic pop +#else +#pragma GCC diagnostic warning "-Wredundant-decls" +#endif +#endif + #include "compat.h" #include "aes.h" #include "util.h" diff --git a/src/common/crypto.c b/src/common/crypto.c index 614f9b5de9..8d990d3345 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -29,6 +29,19 @@ #include "crypto_ed25519.h" #include "crypto_format.h" +#ifdef __GNUC__ +#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) +#endif + +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 +#pragma GCC diagnostic push +#endif +/* Some versions of OpenSSL declare X509_STORE_CTX_set_verify_cb twice. + * Suppress the GCC warning so we can build with -Wredundant-decl. */ +#pragma GCC diagnostic ignored "-Wredundant-decls" +#endif + #include <openssl/err.h> #include <openssl/rsa.h> #include <openssl/pem.h> @@ -40,6 +53,14 @@ #include <openssl/conf.h> #include <openssl/hmac.h> +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 +#pragma GCC diagnostic pop +#else +#pragma GCC diagnostic warning "-Wredundant-decls" +#endif +#endif + #ifdef HAVE_CTYPE_H #include <ctype.h> #endif diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index 581f58b45f..dbd1e5ac48 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -14,10 +14,31 @@ #include "test.h" +#ifdef __GNUC__ +#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) +#endif + +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 +#pragma GCC diagnostic push +#endif +/* Some versions of OpenSSL declare X509_STORE_CTX_set_verify_cb twice. + * Suppress the GCC warning so we can build with -Wredundant-decl. */ +#pragma GCC diagnostic ignored "-Wredundant-decls" +#endif + #include <openssl/rsa.h> #include <openssl/bn.h> #include <openssl/pem.h> +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 +#pragma GCC diagnostic pop +#else +#pragma GCC diagnostic warning "-Wredundant-decls" +#endif +#endif + #ifdef _WIN32 /* For mkdir() */ #include <direct.h> |