nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve the remaining openssl "-Wredundant-decls" warnings.

Browse Source 
Another part of 19406
This commit is contained in:
Nick Mathewson 2016-06-14 20:14:53 -04:00
parent 71aacbe427
commit d6b01211b9
3 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/aes.c
View File

@ -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"

21
src/common/crypto.c
View File

@ -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

21
src/test/test_microdesc.c
View File

@ -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>