diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-09 07:32:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-09 07:32:39 -0500 |
| commit | e45810113b150533611c7d9cb5f0f264e00a7394 (patch) | |
| tree | 771581e87e36d6e4a4c81019c61b0dcb444c5096 /src/lib/tls | |
| parent | a48cb9fa436720c263dd41ce501076185aeb5872 (diff) | |
| parent | 8b2041c343098052dcec03cd6eda7087bc5c7616 (diff) | |
| download | tor-e45810113b150533611c7d9cb5f0f264e00a7394.tar.gz tor-e45810113b150533611c7d9cb5f0f264e00a7394.zip | |
Merge branch 'pre_formatter_cleanups_squashed'
Diffstat (limited to 'src/lib/tls')
| -rw-r--r-- | src/lib/tls/tortls_internal.h | 2 | ||||
| -rw-r--r-- | src/lib/tls/tortls_nss.c | 4 | ||||
| -rw-r--r-- | src/lib/tls/tortls_openssl.c | 4 | ||||
| -rw-r--r-- | src/lib/tls/x509_openssl.c | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/lib/tls/tortls_internal.h b/src/lib/tls/tortls_internal.h index bc17012261..3f56f181ee 100644 --- a/src/lib/tls/tortls_internal.h +++ b/src/lib/tls/tortls_internal.h @@ -11,6 +11,8 @@ #ifndef TORTLS_INTERNAL_H #define TORTLS_INTERNAL_H +#include "lib/tls/x509.h" + int tor_errno_to_tls_error(int e); #ifdef ENABLE_OPENSSL int tor_tls_get_error(tor_tls_t *tls, int r, int extra, diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c index 915a8eacff..62e8262115 100644 --- a/src/lib/tls/tortls_nss.c +++ b/src/lib/tls/tortls_nss.c @@ -34,7 +34,7 @@ #include "lib/tls/nss_countbytes.h" #include "lib/log/util_bug.h" -DISABLE_GCC_WARNING(strict-prototypes) +DISABLE_GCC_WARNING("-Wstrict-prototypes") #include <prio.h> // For access to rar sockets. #include <private/pprio.h> @@ -42,7 +42,7 @@ DISABLE_GCC_WARNING(strict-prototypes) #include <sslt.h> #include <sslproto.h> #include <certt.h> -ENABLE_GCC_WARNING(strict-prototypes) +ENABLE_GCC_WARNING("-Wstrict-prototypes") static SECStatus always_accept_cert_cb(void *, PRFileDesc *, PRBool, PRBool); diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index ad0d68e6ac..68d6e2aa50 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -37,7 +37,7 @@ /* 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. */ -DISABLE_GCC_WARNING(redundant-decls) +DISABLE_GCC_WARNING("-Wredundant-decls") #include <openssl/opensslv.h> @@ -54,7 +54,7 @@ DISABLE_GCC_WARNING(redundant-decls) #include <openssl/bn.h> #include <openssl/rsa.h> -ENABLE_GCC_WARNING(redundant-decls) +ENABLE_GCC_WARNING("-Wredundant-decls") #include "lib/tls/tortls.h" #include "lib/tls/tortls_st.h" diff --git a/src/lib/tls/x509_openssl.c b/src/lib/tls/x509_openssl.c index 97a6c18cb4..2abf02851d 100644 --- a/src/lib/tls/x509_openssl.c +++ b/src/lib/tls/x509_openssl.c @@ -19,7 +19,7 @@ /* 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. */ -DISABLE_GCC_WARNING(redundant-decls) +DISABLE_GCC_WARNING("-Wredundant-decls") #include <openssl/opensslv.h> @@ -36,7 +36,7 @@ DISABLE_GCC_WARNING(redundant-decls) #include <openssl/rsa.h> #include <openssl/x509.h> -ENABLE_GCC_WARNING(redundant-decls) +ENABLE_GCC_WARNING("-Wredundant-decls") #include "lib/log/log.h" #include "lib/log/util_bug.h" |