tor-commits January 2020

tor-commits@lists.torproject.org

19 participants
1596 discussions

[tor/master] process.h: include stdbool.h
by nickm＠torproject.org 09 Jan '20

09 Jan '20

commit 3ad518cd97e0a211dc2a3a9d759d8f85d4896d52 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 13:37:49 2019 -0500 process.h: include stdbool.h We use bool, so we should include stdbool. --- src/lib/process/process.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/process/process.h b/src/lib/process/process.h index d0a66c490..7ab59fb26 100644 --- a/src/lib/process/process.h +++ b/src/lib/process/process.h @@ -15,6 +15,8 @@ #include "lib/malloc/malloc.h" #include "lib/string/printf.h" +#include <stdbool.h> + /** Maximum number of bytes to write to a process' stdin. */ #define PROCESS_MAX_WRITE (1024)

1 0

[tor/master] Merge branch 'pre_formatter_cleanups_squashed'
by nickm＠torproject.org 09 Jan '20

09 Jan '20

commit e45810113b150533611c7d9cb5f0f264e00a7394 Merge: a48cb9fa4 8b2041c34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 9 07:32:39 2020 -0500 Merge branch 'pre_formatter_cleanups_squashed' changes/ticket32764 | 9 ++ src/app/config/or_options_st.h | 39 +++--- src/core/crypto/hs_ntor.h | 4 +- src/core/mainloop/.may_include | 2 + src/core/mainloop/connection.h | 200 +++++++++++++++++------------- src/core/or/.may_include | 4 +- src/core/or/channel.h | 1 + src/core/or/circuit_st.h | 1 + src/core/or/scheduler.h | 3 +- src/ext/ht.h | 3 +- src/ext/siphash.h | 2 + src/ext/tinytest_macros.h | 4 +- src/feature/control/control_hs.h | 15 +-- src/feature/dirauth/authmode.c | 9 ++ src/feature/dirauth/authmode.h | 9 +- src/feature/dirauth/keypin.h | 2 + src/feature/dircache/conscache.h | 2 + src/feature/dircache/consdiffmgr.h | 10 +- src/feature/dirparse/routerparse.h | 1 + src/feature/hs/hs_circuit.h | 5 +- src/feature/hs/hs_circuitmap.h | 11 +- src/feature/hs/hs_service.h | 2 + src/feature/nodelist/microdesc_st.h | 2 + src/feature/nodelist/node_st.h | 1 + src/feature/relay/dns_structs.h | 3 +- src/feature/stats/geoip_stats.h | 1 + src/lib/cc/compat_compiler.h | 8 +- src/lib/compress/compress_zstd.c | 4 +- src/lib/conf/conftesting.h | 2 + src/lib/crypt_ops/aes_nss.c | 4 +- src/lib/crypt_ops/aes_openssl.c | 4 +- src/lib/crypt_ops/crypto_dh_openssl.c | 4 +- src/lib/crypt_ops/crypto_digest_nss.c | 4 +- src/lib/crypt_ops/crypto_digest_openssl.c | 4 +- src/lib/crypt_ops/crypto_nss_mgt.c | 4 +- src/lib/crypt_ops/crypto_openssl_mgt.c | 4 +- src/lib/crypt_ops/crypto_rand.c | 4 +- src/lib/crypt_ops/crypto_rsa_nss.c | 2 +- src/lib/crypt_ops/crypto_rsa_openssl.c | 4 +- src/lib/crypt_ops/crypto_util.c | 4 +- src/lib/evloop/timers.h | 1 + src/lib/fdio/fdio.h | 3 + src/lib/math/fp.c | 16 +-- src/lib/meminfo/meminfo.c | 4 +- src/lib/process/process.h | 15 ++- src/lib/tls/tortls_internal.h | 2 + src/lib/tls/tortls_nss.c | 4 +- src/lib/tls/tortls_openssl.c | 4 +- src/lib/tls/x509_openssl.c | 4 +- src/test/test_bt_cl.c | 4 +- src/test/test_circuitlist.c | 2 +- src/test/test_config.c | 8 +- src/test/test_crypto.c | 4 +- src/test/test_dir_handle_get.c | 6 +- src/test/test_helpers.c | 4 +- src/test/test_hs_descriptor.c | 4 +- src/test/test_microdesc.c | 4 +- src/test/test_tortls_openssl.c | 4 +- src/tools/tor-gencert.c | 4 +- 59 files changed, 288 insertions(+), 210 deletions(-) diff --cc src/core/or/scheduler.h index 1a1429868,03cb45675..82df2b0b0 --- a/src/core/or/scheduler.h +++ b/src/core/or/scheduler.h @@@ -136,8 -136,10 +136,10 @@@ MOCK_DECL(void, scheduler_channel_has_w * These functions are only visible to the scheduling system, the current * scheduler implementation, and tests. *****************************************************************************/ -#ifdef SCHEDULER_PRIVATE_ +#ifdef SCHEDULER_PRIVATE + #include "ext/ht.h" + /********************************* * Defined in scheduler.c *********************************/ @@@ -212,7 -214,6 +214,6 @@@ extern int32_t sched_run_interval scheduler_t *get_vanilla_scheduler(void); -#endif /* defined(SCHEDULER_PRIVATE_) */ +#endif /* defined(SCHEDULER_PRIVATE) */ #endif /* !defined(TOR_SCHEDULER_H) */ - diff --cc src/feature/control/control_hs.h index 8b9ebaba1,da96866f5..8a0cd6818 --- a/src/feature/control/control_hs.h +++ b/src/feature/control/control_hs.h @@@ -18,16 -20,15 +20,15 @@@ extern const struct control_cmd_syntax_ extern const struct control_cmd_syntax_t onion_client_auth_view_syntax; int - handle_control_onion_client_auth_add(control_connection_t *conn, - const control_cmd_args_t *args); + handle_control_onion_client_auth_add(struct control_connection_t *conn, + const struct control_cmd_args_t *args); int - handle_control_onion_client_auth_remove(control_connection_t *conn, - const control_cmd_args_t *args); + handle_control_onion_client_auth_remove(struct control_connection_t *conn, + const struct control_cmd_args_t *args); int - handle_control_onion_client_auth_view(control_connection_t *conn, - const control_cmd_args_t *args); + handle_control_onion_client_auth_view(struct control_connection_t *conn, + const struct control_cmd_args_t *args); -#endif +#endif /* !defined(TOR_CONTROL_HS_H) */ - diff --cc src/feature/dirparse/routerparse.h index ca9250fa9,cedbfbf33..519044e9b --- a/src/feature/dirparse/routerparse.h +++ b/src/feature/dirparse/routerparse.h @@@ -40,7 -40,8 +40,8 @@@ int find_single_ipv6_orport(const smart void routerparse_init(void); void routerparse_free_all(void); -#ifdef EXPOSE_ROUTERDESC_TOKEN_TABLE +#ifdef ROUTERDESC_TOKEN_TABLE_PRIVATE + #include "feature/dirparse/parsecommon.h" extern const struct token_rule_t routerdesc_token_table[]; #endif diff --cc src/lib/crypt_ops/aes_openssl.c index 4ee22647d,ce386ac68..502f7703b --- a/src/lib/crypt_ops/aes_openssl.c +++ b/src/lib/crypt_ops/aes_openssl.c @@@ -37,8 -37,9 +37,8 @@@ DISABLE_GCC_WARNING("-Wredundant-decls" #include <openssl/engine.h> #include <openssl/modes.h> - ENABLE_GCC_WARNING(redundant-decls) + ENABLE_GCC_WARNING("-Wredundant-decls") -#include "lib/crypt_ops/aes.h" #include "lib/log/log.h" #include "lib/ctime/di_ops.h"

1 0

[tor/master] Use new ENABLE/DISABLE_GCC_WARNING
by nickm＠torproject.org 09 Jan '20

09 Jan '20

commit 3ce2304c6d031020cd8a1f00dee6e87fbf40ecd4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 2 17:04:17 2019 -0500 Use new ENABLE/DISABLE_GCC_WARNING This is an automated commit, generated by: perl -i -pe 'next if /define/; s/((?:ENABLE|DISABLE)_GCC_WARNING)$([A-Za-z0-9_\-]+)$/$1(\"-W$2\")/' src/*/*/*.[ch] src/*/*.[ch] --- src/lib/compress/compress_zstd.c | 4 ++-- src/lib/crypt_ops/aes_nss.c | 4 ++-- src/lib/crypt_ops/aes_openssl.c | 4 ++-- src/lib/crypt_ops/crypto_dh_openssl.c | 4 ++-- src/lib/crypt_ops/crypto_digest_nss.c | 4 ++-- src/lib/crypt_ops/crypto_digest_openssl.c | 4 ++-- src/lib/crypt_ops/crypto_nss_mgt.c | 4 ++-- src/lib/crypt_ops/crypto_openssl_mgt.c | 4 ++-- src/lib/crypt_ops/crypto_rand.c | 4 ++-- src/lib/crypt_ops/crypto_rsa_nss.c | 2 +- src/lib/crypt_ops/crypto_rsa_openssl.c | 4 ++-- src/lib/crypt_ops/crypto_util.c | 4 ++-- src/lib/math/fp.c | 16 ++++++++-------- src/lib/meminfo/meminfo.c | 4 ++-- src/lib/tls/tortls_nss.c | 4 ++-- src/lib/tls/tortls_openssl.c | 4 ++-- src/lib/tls/x509_openssl.c | 4 ++-- src/test/test_bt_cl.c | 4 ++-- src/test/test_crypto.c | 4 ++-- src/test/test_dir_handle_get.c | 4 ++-- src/test/test_helpers.c | 4 ++-- src/test/test_hs_descriptor.c | 4 ++-- src/test/test_microdesc.c | 4 ++-- src/test/test_tortls_openssl.c | 4 ++-- src/tools/tor-gencert.c | 4 ++-- 25 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/lib/compress/compress_zstd.c b/src/lib/compress/compress_zstd.c index 907666529..87550ddf5 100644 --- a/src/lib/compress/compress_zstd.c +++ b/src/lib/compress/compress_zstd.c @@ -29,11 +29,11 @@ #ifdef HAVE_ZSTD #ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE -DISABLE_GCC_WARNING(unused-const-variable) +DISABLE_GCC_WARNING("-Wunused-const-variable") #endif #include <zstd.h> #ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE -ENABLE_GCC_WARNING(unused-const-variable) +ENABLE_GCC_WARNING("-Wunused-const-variable") #endif #endif /* defined(HAVE_ZSTD) */ diff --git a/src/lib/crypt_ops/aes_nss.c b/src/lib/crypt_ops/aes_nss.c index 4eda5e590..38ee6a0cf 100644 --- a/src/lib/crypt_ops/aes_nss.c +++ b/src/lib/crypt_ops/aes_nss.c @@ -15,10 +15,10 @@ #include "lib/crypt_ops/crypto_util.h" #include "lib/log/util_bug.h" -DISABLE_GCC_WARNING(strict-prototypes) +DISABLE_GCC_WARNING("-Wstrict-prototypes") #include <pk11pub.h> #include <secerr.h> -ENABLE_GCC_WARNING(strict-prototypes) +ENABLE_GCC_WARNING("-Wstrict-prototypes") aes_cnt_cipher_t * aes_new_cipher(const uint8_t *key, const uint8_t *iv, diff --git a/src/lib/crypt_ops/aes_openssl.c b/src/lib/crypt_ops/aes_openssl.c index d493b1846..ce386ac68 100644 --- a/src/lib/crypt_ops/aes_openssl.c +++ b/src/lib/crypt_ops/aes_openssl.c @@ -28,7 +28,7 @@ #error "We require OpenSSL >= 1.0.0" #endif -DISABLE_GCC_WARNING(redundant-decls) +DISABLE_GCC_WARNING("-Wredundant-decls") #include <stdlib.h> #include <string.h> @@ -37,7 +37,7 @@ DISABLE_GCC_WARNING(redundant-decls) #include <openssl/engine.h> #include <openssl/modes.h> -ENABLE_GCC_WARNING(redundant-decls) +ENABLE_GCC_WARNING("-Wredundant-decls") #include "lib/crypt_ops/aes.h" #include "lib/log/log.h" diff --git a/src/lib/crypt_ops/crypto_dh_openssl.c b/src/lib/crypt_ops/crypto_dh_openssl.c index e7f22d749..3311c9c1f 100644 --- a/src/lib/crypt_ops/crypto_dh_openssl.c +++ b/src/lib/crypt_ops/crypto_dh_openssl.c @@ -17,11 +17,11 @@ #include "lib/log/log.h" #include "lib/log/util_bug.h" -DISABLE_GCC_WARNING(redundant-decls) +DISABLE_GCC_WARNING("-Wredundant-decls") #include <openssl/dh.h> -ENABLE_GCC_WARNING(redundant-decls) +ENABLE_GCC_WARNING("-Wredundant-decls") #include <openssl/bn.h> #include <string.h> diff --git a/src/lib/crypt_ops/crypto_digest_nss.c b/src/lib/crypt_ops/crypto_digest_nss.c index 54fb71443..4ca63cb20 100644 --- a/src/lib/crypt_ops/crypto_digest_nss.c +++ b/src/lib/crypt_ops/crypto_digest_nss.c @@ -23,9 +23,9 @@ #include "lib/arch/bytes.h" -DISABLE_GCC_WARNING(strict-prototypes) +DISABLE_GCC_WARNING("-Wstrict-prototypes") #include <pk11pub.h> -ENABLE_GCC_WARNING(strict-prototypes) +ENABLE_GCC_WARNING("-Wstrict-prototypes") /** * Convert a digest_algorithm_t (used by tor) to a HashType (used by NSS). diff --git a/src/lib/crypt_ops/crypto_digest_openssl.c b/src/lib/crypt_ops/crypto_digest_openssl.c index 319714f86..23ae0f6c3 100644 --- a/src/lib/crypt_ops/crypto_digest_openssl.c +++ b/src/lib/crypt_ops/crypto_digest_openssl.c @@ -25,12 +25,12 @@ #include "lib/crypt_ops/crypto_openssl_mgt.h" -DISABLE_GCC_WARNING(redundant-decls) +DISABLE_GCC_WARNING("-Wredundant-decls") #include <openssl/hmac.h> #include <openssl/sha.h> -ENABLE_GCC_WARNING(redundant-decls) +ENABLE_GCC_WARNING("-Wredundant-decls") /* Crypto digest functions */ diff --git a/src/lib/crypt_ops/crypto_nss_mgt.c b/src/lib/crypt_ops/crypto_nss_mgt.c index 0179126e3..fbffe9121 100644 --- a/src/lib/crypt_ops/crypto_nss_mgt.c +++ b/src/lib/crypt_ops/crypto_nss_mgt.c @@ -16,7 +16,7 @@ #include "lib/log/util_bug.h" #include "lib/string/printf.h" -DISABLE_GCC_WARNING(strict-prototypes) +DISABLE_GCC_WARNING("-Wstrict-prototypes") #include <nss.h> #include <pk11func.h> #include <ssl.h> @@ -24,7 +24,7 @@ DISABLE_GCC_WARNING(strict-prototypes) #include <prerror.h> #include <prtypes.h> #include <prinit.h> -ENABLE_GCC_WARNING(strict-prototypes) +ENABLE_GCC_WARNING("-Wstrict-prototypes") const char * crypto_nss_get_version_str(void) diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c index cf0e499ee..07019f59c 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.c +++ b/src/lib/crypt_ops/crypto_openssl_mgt.c @@ -21,7 +21,7 @@ #include "lib/testsupport/testsupport.h" #include "lib/thread/threads.h" -DISABLE_GCC_WARNING(redundant-decls) +DISABLE_GCC_WARNING("-Wredundant-decls") #include <openssl/err.h> #include <openssl/rsa.h> @@ -36,7 +36,7 @@ DISABLE_GCC_WARNING(redundant-decls) #include <openssl/crypto.h> #include <openssl/ssl.h> -ENABLE_GCC_WARNING(redundant-decls) +ENABLE_GCC_WARNING("-Wredundant-decls") #include <string.h> diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index afbafbfa3..9254a127e 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -43,10 +43,10 @@ #endif #ifdef ENABLE_OPENSSL -DISABLE_GCC_WARNING(redundant-decls) +DISABLE_GCC_WARNING("-Wredundant-decls") #include <openssl/rand.h> #include <openssl/sha.h> -ENABLE_GCC_WARNING(redundant-decls) +ENABLE_GCC_WARNING("-Wredundant-decls") #endif /* defined(ENABLE_OPENSSL) */ #ifdef ENABLE_NSS diff --git a/src/lib/crypt_ops/crypto_rsa_nss.c b/src/lib/crypt_ops/crypto_rsa_nss.c index 612b7a0e6..8f37f1389 100644 --- a/src/lib/crypt_ops/crypto_rsa_nss.c +++ b/src/lib/crypt_ops/crypto_rsa_nss.c @@ -645,7 +645,7 @@ crypto_pk_asn1_decode(const char *str, size_t len) return result; } -DISABLE_GCC_WARNING(unused-parameter) +DISABLE_GCC_WARNING("-Wunused-parameter") /** Given a crypto_pk_t <b>pk</b>, allocate a new buffer containing the Base64 * encoding of the DER representation of the private key into the diff --git a/src/lib/crypt_ops/crypto_rsa_openssl.c b/src/lib/crypt_ops/crypto_rsa_openssl.c index 05d7c26b2..b733e17f9 100644 --- a/src/lib/crypt_ops/crypto_rsa_openssl.c +++ b/src/lib/crypt_ops/crypto_rsa_openssl.c @@ -16,7 +16,7 @@ #include "lib/log/util_bug.h" #include "lib/fs/files.h" -DISABLE_GCC_WARNING(redundant-decls) +DISABLE_GCC_WARNING("-Wredundant-decls") #include <openssl/err.h> #include <openssl/rsa.h> @@ -27,7 +27,7 @@ DISABLE_GCC_WARNING(redundant-decls) #include <openssl/bn.h> #include <openssl/conf.h> -ENABLE_GCC_WARNING(redundant-decls) +ENABLE_GCC_WARNING("-Wredundant-decls") #include "lib/log/log.h" #include "lib/encoding/binascii.h" diff --git a/src/lib/crypt_ops/crypto_util.c b/src/lib/crypt_ops/crypto_util.c index 5e3f4a87a..913c2e2be 100644 --- a/src/lib/crypt_ops/crypto_util.c +++ b/src/lib/crypt_ops/crypto_util.c @@ -26,10 +26,10 @@ #include <stdlib.h> #ifdef ENABLE_OPENSSL -DISABLE_GCC_WARNING(redundant-decls) +DISABLE_GCC_WARNING("-Wredundant-decls") #include <openssl/err.h> #include <openssl/crypto.h> -ENABLE_GCC_WARNING(redundant-decls) +ENABLE_GCC_WARNING("-Wredundant-decls") #endif /* defined(ENABLE_OPENSSL) */ #include "lib/log/log.h" diff --git a/src/lib/math/fp.c b/src/lib/math/fp.c index 49a2a6a2c..daa63ab68 100644 --- a/src/lib/math/fp.c +++ b/src/lib/math/fp.c @@ -74,7 +74,7 @@ clamp_double_to_int64(double number) branches that are not taken. */ #define PROBLEMATIC_FLOAT_CONVERSION_WARNING -DISABLE_GCC_WARNING(float-conversion) +DISABLE_GCC_WARNING("-Wfloat-conversion") #endif /* (defined(MINGW_ANY)||defined(__FreeBSD__)) && GCC_VERSION >= 409 */ /* @@ -84,7 +84,7 @@ DISABLE_GCC_WARNING(float-conversion) #if defined(__clang__) #if __has_warning("-Wdouble-promotion") #define PROBLEMATIC_DOUBLE_PROMOTION_WARNING -DISABLE_GCC_WARNING(double-promotion) +DISABLE_GCC_WARNING("-Wdouble-promotion") #endif #endif /* defined(__clang__) */ @@ -115,10 +115,10 @@ DISABLE_GCC_WARNING(double-promotion) return signbit(number) ? INT64_MIN : INT64_MAX; #ifdef PROBLEMATIC_DOUBLE_PROMOTION_WARNING -ENABLE_GCC_WARNING(double-promotion) +ENABLE_GCC_WARNING("-Wdouble-promotion") #endif #ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING -ENABLE_GCC_WARNING(float-conversion) +ENABLE_GCC_WARNING("-Wfloat-conversion") #endif } @@ -128,16 +128,16 @@ tor_isinf(double x) { /* Same as above, work around the "double promotion" warnings */ #ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING -DISABLE_GCC_WARNING(float-conversion) +DISABLE_GCC_WARNING("-Wfloat-conversion") #endif #ifdef PROBLEMATIC_DOUBLE_PROMOTION_WARNING -DISABLE_GCC_WARNING(double-promotion) +DISABLE_GCC_WARNING("-Wdouble-promotion") #endif return isinf(x); #ifdef PROBLEMATIC_DOUBLE_PROMOTION_WARNING -ENABLE_GCC_WARNING(double-promotion) +ENABLE_GCC_WARNING("-Wdouble-promotion") #endif #ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING -ENABLE_GCC_WARNING(float-conversion) +ENABLE_GCC_WARNING("-Wfloat-conversion") #endif } diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c index bff71c2f0..3b6da1d1b 100644 --- a/src/lib/meminfo/meminfo.c +++ b/src/lib/meminfo/meminfo.c @@ -37,7 +37,7 @@ #include <sys/sysctl.h> #endif -DISABLE_GCC_WARNING(aggregate-return) +DISABLE_GCC_WARNING("-Waggregate-return") /** Call the platform malloc info function, and dump the results to the log at * level <b>severity</b>. If no such function exists, do nothing. */ void @@ -58,7 +58,7 @@ tor_log_mallinfo(int severity) (void)severity; #endif /* defined(HAVE_MALLINFO) */ } -ENABLE_GCC_WARNING(aggregate-return) +ENABLE_GCC_WARNING("-Waggregate-return") #if defined(HW_PHYSMEM64) /* OpenBSD and NetBSD define this */ diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c index 3c62e98df..3401c4100 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 9184cafd6..2252e480b 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 772428827..d1fe89901 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" diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c index b29c2c6cb..59d928045 100644 --- a/src/test/test_bt_cl.c +++ b/src/test/test_bt_cl.c @@ -33,7 +33,7 @@ int a_tangled_web(int x) NOINLINE; int we_weave(int x) NOINLINE; #ifdef HAVE_CFLAG_WNULL_DEREFERENCE -DISABLE_GCC_WARNING(null-dereference) +DISABLE_GCC_WARNING("-Wnull-dereference") #endif int crash(int x) @@ -55,7 +55,7 @@ crash(int x) return crashtype; } #ifdef HAVE_CFLAG_WNULL_DEREFERENCE -ENABLE_GCC_WARNING(null-dereference) +ENABLE_GCC_WARNING("-Wnull-dereference") #endif int diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 2c57e50a4..dce3c6d35 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -29,9 +29,9 @@ #if defined(ENABLE_OPENSSL) #include "lib/crypt_ops/compat_openssl.h" -DISABLE_GCC_WARNING(redundant-decls) +DISABLE_GCC_WARNING("-Wredundant-decls") #include <openssl/dh.h> -ENABLE_GCC_WARNING(redundant-decls) +ENABLE_GCC_WARNING("-Wredundant-decls") #endif /* defined(ENABLE_OPENSSL) */ /** Run unit tests for Diffie-Hellman functionality. */ diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index ae968eb7e..2b311a2f2 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -55,13 +55,13 @@ #endif /* defined(_WIN32) */ #ifdef HAVE_CFLAG_WOVERLENGTH_STRINGS -DISABLE_GCC_WARNING(overlength-strings) +DISABLE_GCC_WARNING("-Woverlength-strings") /* We allow huge string constants in the unit tests, but not in the code * at large. */ #endif #include "vote_descriptors.inc" #ifdef HAVE_CFLAG_WOVERLENGTH_STRINGS -ENABLE_GCC_WARNING(overlength-strings) +ENABLE_GCC_WARNING("-Woverlength-strings") #endif #define NS_MODULE dir_handle_get diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c index 29743a0d1..751ae265e 100644 --- a/src/test/test_helpers.c +++ b/src/test/test_helpers.c @@ -42,14 +42,14 @@ #include "test/test_connection.h" #ifdef HAVE_CFLAG_WOVERLENGTH_STRINGS -DISABLE_GCC_WARNING(overlength-strings) +DISABLE_GCC_WARNING("-Woverlength-strings") /* We allow huge string constants in the unit tests, but not in the code * at large. */ #endif #include "test_descriptors.inc" #include "core/or/circuitlist.h" #ifdef HAVE_CFLAG_WOVERLENGTH_STRINGS -ENABLE_GCC_WARNING(overlength-strings) +ENABLE_GCC_WARNING("-Woverlength-strings") #endif /* Return a statically allocated string representing yesterday's date diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 9587cae85..cdd9e22fc 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -24,12 +24,12 @@ #include "test/rng_test_helpers.h" #ifdef HAVE_CFLAG_WOVERLENGTH_STRINGS -DISABLE_GCC_WARNING(overlength-strings) +DISABLE_GCC_WARNING("-Woverlength-strings") /* We allow huge string constants in the unit tests, but not in the code * at large. */ #endif #include "test_hs_descriptor.inc" -ENABLE_GCC_WARNING(overlength-strings) +ENABLE_GCC_WARNING("-Woverlength-strings") /* Test certificate encoding put in a descriptor. */ static void diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index 804e6c546..9b751ebc3 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -491,7 +491,7 @@ test_md_generate(void *arg) } #ifdef HAVE_CFLAG_WOVERLENGTH_STRINGS -DISABLE_GCC_WARNING(overlength-strings) +DISABLE_GCC_WARNING("-Woverlength-strings") /* We allow huge string constants in the unit tests, but not in the code * at large. */ #endif @@ -686,7 +686,7 @@ static const char MD_PARSE_TEST_DATA[] = "id rsa1024 2A8wYpHxnkKJ92orocvIQBzeHlE\n" ; #ifdef HAVE_CFLAG_WOVERLENGTH_STRINGS -ENABLE_GCC_WARNING(overlength-strings) +ENABLE_GCC_WARNING("-Woverlength-strings") #endif /** More tests for parsing different kinds of microdescriptors, and getting diff --git a/src/test/test_tortls_openssl.c b/src/test/test_tortls_openssl.c index 81e2d3aa4..0935151c6 100644 --- a/src/test/test_tortls_openssl.c +++ b/src/test/test_tortls_openssl.c @@ -16,7 +16,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> @@ -29,7 +29,7 @@ DISABLE_GCC_WARNING(redundant-decls) #include <openssl/evp.h> #include <openssl/bn.h> -ENABLE_GCC_WARNING(redundant-decls) +ENABLE_GCC_WARNING("-Wredundant-decls") #include "core/or/or.h" #include "lib/log/log.h" diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index ea96f41db..a081f5401 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -21,7 +21,7 @@ /* Some versions of OpenSSL declare X509_STORE_CTX_set_verify_cb twice in * x509.h and x509_vfy.h. Suppress the GCC warning so we can build with * -Wredundant-decl. */ -DISABLE_GCC_WARNING(redundant-decls) +DISABLE_GCC_WARNING("-Wredundant-decls") #include <openssl/evp.h> #include <openssl/pem.h> @@ -30,7 +30,7 @@ DISABLE_GCC_WARNING(redundant-decls) #include <openssl/obj_mac.h> #include <openssl/err.h> -ENABLE_GCC_WARNING(redundant-decls) +ENABLE_GCC_WARNING("-Wredundant-decls") #endif /* defined(ENABLE_OPENSSL) */ #include <errno.h>

1 0

[tor/master] Include sys/types.h in fdio.h, for "off_t".
by nickm＠torproject.org 09 Jan '20

09 Jan '20

commit b1dceeca5a8e5bf948d185728631fee114fac6f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 12:58:25 2019 -0500 Include sys/types.h in fdio.h, for "off_t". Otherwise our compilation depends on include order. --- src/lib/fdio/fdio.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/fdio/fdio.h b/src/lib/fdio/fdio.h index 8395af353..751d01bc0 100644 --- a/src/lib/fdio/fdio.h +++ b/src/lib/fdio/fdio.h @@ -13,6 +13,9 @@ #define TOR_FDIO_H #include <stddef.h> +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif off_t tor_fd_getpos(int fd); int tor_fd_setpos(int fd, off_t pos);

1 0

[tor/master] Remove extra ; from tt_assert() macro definition.
by nickm＠torproject.org 09 Jan '20

09 Jan '20

commit 73b83b8f1a92aee93543095c96ae59ed6ba064a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 3 00:51:09 2019 -0500 Remove extra ; from tt_assert() macro definition. We were actually omitting the semicolon in a few places, leading to confusing indentation and some cocci failures. --- src/ext/tinytest_macros.h | 4 ++-- src/test/test_circuitlist.c | 2 +- src/test/test_config.c | 8 ++++---- src/test/test_dir_handle_get.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ext/tinytest_macros.h b/src/ext/tinytest_macros.h index c3728d1fd..6fc2cea2d 100644 --- a/src/ext/tinytest_macros.h +++ b/src/ext/tinytest_macros.h @@ -99,11 +99,11 @@ /* Assert b, but do not stop the test if b fails. Log msg on failure. */ #define tt_want_msg(b, msg) \ - tt_want_(b, msg, ); + tt_want_(b, msg, ) /* Assert b and stop the test if b fails. Log msg on failure. */ #define tt_assert_msg(b, msg) \ - tt_want_(b, msg, TT_EXIT_TEST_FUNCTION); + tt_want_(b, msg, TT_EXIT_TEST_FUNCTION) /* Assert b, but do not stop the test if b fails. */ #define tt_want(b) tt_want_msg( (b), "want("#b")") diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c index 5cebdbeda..013b66b35 100644 --- a/src/test/test_circuitlist.c +++ b/src/test/test_circuitlist.c @@ -136,7 +136,7 @@ test_clist_maps(void *arg) channel_note_destroy_pending(ch2, 200); channel_note_destroy_pending(ch2, 205); channel_note_destroy_pending(ch1, 100); - tt_assert(circuit_id_in_use_on_channel(205, ch2)) + tt_assert(circuit_id_in_use_on_channel(205, ch2)); tt_assert(circuit_id_in_use_on_channel(200, ch2)); tt_assert(circuit_id_in_use_on_channel(100, ch1)); diff --git a/src/test/test_config.c b/src/test/test_config.c index 8f705da7e..512ccb85c 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4680,7 +4680,7 @@ test_config_parse_port_config__ports__ports_given(void *data) port_cfg = (port_cfg_t *)smartlist_get(slout, 0); tt_int_op(port_cfg->port, OP_EQ, CFG_AUTO_PORT); tor_addr_parse(&addr, "127.0.0.46"); - tt_assert(tor_addr_eq(&port_cfg->addr, &addr)) + tt_assert(tor_addr_eq(&port_cfg->addr, &addr)); // Test success with a port of auto in mixed case config_free_lines(config_port_valid); config_port_valid = NULL; @@ -4694,7 +4694,7 @@ test_config_parse_port_config__ports__ports_given(void *data) port_cfg = (port_cfg_t *)smartlist_get(slout, 0); tt_int_op(port_cfg->port, OP_EQ, CFG_AUTO_PORT); tor_addr_parse(&addr, "127.0.0.46"); - tt_assert(tor_addr_eq(&port_cfg->addr, &addr)) + tt_assert(tor_addr_eq(&port_cfg->addr, &addr)); // Test success with parsing both an address and an auto port config_free_lines(config_port_valid); config_port_valid = NULL; @@ -4708,7 +4708,7 @@ test_config_parse_port_config__ports__ports_given(void *data) port_cfg = (port_cfg_t *)smartlist_get(slout, 0); tt_int_op(port_cfg->port, OP_EQ, CFG_AUTO_PORT); tor_addr_parse(&addr, "127.0.0.122"); - tt_assert(tor_addr_eq(&port_cfg->addr, &addr)) + tt_assert(tor_addr_eq(&port_cfg->addr, &addr)); // Test failure when asked to parse an invalid address followed by auto config_free_lines(config_port_invalid); config_port_invalid = NULL; @@ -4731,7 +4731,7 @@ test_config_parse_port_config__ports__ports_given(void *data) port_cfg = (port_cfg_t *)smartlist_get(slout, 0); tt_int_op(port_cfg->port, OP_EQ, 656); tor_addr_parse(&addr, "127.0.0.123"); - tt_assert(tor_addr_eq(&port_cfg->addr, &addr)) + tt_assert(tor_addr_eq(&port_cfg->addr, &addr)); // Test failure if we can't parse anything at all config_free_lines(config_port_invalid); config_port_invalid = NULL; diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 2b311a2f2..ffe904522 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -258,7 +258,7 @@ test_dir_handle_get_rendezvous2_not_found_if_not_encrypted(void *data) conn = new_dir_conn(); // connection is not encrypted - tt_assert(!connection_dir_is_encrypted(conn)) + tt_assert(!connection_dir_is_encrypted(conn)); tt_int_op(directory_handle_command_get(conn, RENDEZVOUS2_GET(), NULL, 0), OP_EQ, 0);

1 0

[tor/master] Use raw_assert in ht.h
by nickm＠torproject.org 09 Jan '20

09 Jan '20

commit 7b0d8834f2d762f610291a1c4ffe1f775f46a5f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 12:57:27 2019 -0500 Use raw_assert in ht.h Also, include torerr.h from ht.h if we are using raw_assert. Otherwise, our includes need to be ordered so that ht.h comes after util_log.h. --- src/ext/ht.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ext/ht.h b/src/ext/ht.h index bb5604131..9d4add193 100644 --- a/src/ext/ht.h +++ b/src/ext/ht.h @@ -226,7 +226,8 @@ ht_string_hash(const char *s) (x) = HT_NEXT(name, head, x)) #ifndef HT_NDEBUG -#define HT_ASSERT_(x) tor_assert(x) +#include "lib/err/torerr.h" +#define HT_ASSERT_(x) raw_assert(x) #else #define HT_ASSERT_(x) (void)0 #endif

1 0

[tor/master] Replace DISABLE/ENABLE_GCC_WARNING with something that will confuse clang-format less
by nickm＠torproject.org 09 Jan '20

09 Jan '20

commit 792e5b24039f008648ace6136ab10cc869e65afc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 2 16:57:37 2019 -0500 Replace DISABLE/ENABLE_GCC_WARNING with something that will confuse clang-format less --- src/lib/cc/compat_compiler.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib/cc/compat_compiler.h b/src/lib/cc/compat_compiler.h index 9e7436ca1..cd359617c 100644 --- a/src/lib/cc/compat_compiler.h +++ b/src/lib/cc/compat_compiler.h @@ -59,8 +59,6 @@ /* Temporarily enable and disable warnings. */ #ifdef __GNUC__ -# define PRAGMA_STRINGIFY_(s) #s -# define PRAGMA_JOIN_STRINGIFY_(a,b) PRAGMA_STRINGIFY_(a ## b) /* Support for macro-generated pragmas (c99) */ # define PRAGMA_(x) _Pragma (#x) # ifdef __clang__ @@ -72,15 +70,15 @@ /* we have push/pop support */ # define DISABLE_GCC_WARNING(warningopt) \ PRAGMA_DIAGNOSTIC_(push) \ - PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_(-W,warningopt)) + PRAGMA_DIAGNOSTIC_(ignored warningopt) # define ENABLE_GCC_WARNING(warningopt) \ PRAGMA_DIAGNOSTIC_(pop) #else /* !(defined(__clang__) || GCC_VERSION >= 406) */ /* older version of gcc: no push/pop support. */ # define DISABLE_GCC_WARNING(warningopt) \ - PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_(-W,warningopt)) + PRAGMA_DIAGNOSTIC_(ignored warningopt) # define ENABLE_GCC_WARNING(warningopt) \ - PRAGMA_DIAGNOSTIC_(warning PRAGMA_JOIN_STRINGIFY_(-W,warningopt)) + PRAGMA_DIAGNOSTIC_(warning warningopt) #endif /* defined(__clang__) || GCC_VERSION >= 406 */ #else /* !defined(__GNUC__) */ /* not gcc at all */

1 0

[tor/master] siphash.h: include stdint.
by nickm＠torproject.org 09 Jan '20

09 Jan '20

commit c4ac5adc4add3645e65fdaebbb3cf5a938137ebe Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 13:06:00 2019 -0500 siphash.h: include stdint. Doing this gives us a valid uint64_t type, freeing us from dependencies on include order. --- src/ext/siphash.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ext/siphash.h b/src/ext/siphash.h index 730e49937..0207a959f 100644 --- a/src/ext/siphash.h +++ b/src/ext/siphash.h @@ -1,6 +1,8 @@ #ifndef SIPHASH_H #define SIPHASH_H +#include <stdint.h> + struct sipkey { uint64_t k0; uint64_t k1;

1 0

[tor/master] Include x509.h in tortls_internal.h.
by nickm＠torproject.org 09 Jan '20

09 Jan '20

commit 8bb686d8a01c975c12b6b78a89faeb45bd778518 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 12:58:58 2019 -0500 Include x509.h in tortls_internal.h. This gives us the definition of tor_x509_cert_impl_t, and makes us less dependent on include order. --- src/lib/tls/tortls_internal.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/tls/tortls_internal.h b/src/lib/tls/tortls_internal.h index a7aee524f..8b7f78233 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,

1 0

[tor/master] hs_circuit: use struct declaration.
by nickm＠torproject.org 09 Jan '20

09 Jan '20

commit 6a6486a7bf327753b5bd84f4f2c113e331e41c1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 16 13:05:01 2019 -0500 hs_circuit: use struct declaration. This frees us from a dependency on include order. --- src/core/crypto/hs_ntor.h | 4 ++-- src/feature/hs/hs_circuit.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/crypto/hs_ntor.h b/src/core/crypto/hs_ntor.h index 5a70974a0..e3bf006a4 100644 --- a/src/core/crypto/hs_ntor.h +++ b/src/core/crypto/hs_ntor.h @@ -19,7 +19,7 @@ struct curve25519_keypair_t; (DIGEST256_LEN*2 + CIPHER256_KEY_LEN*2) /* Key material needed to encode/decode INTRODUCE1 cells */ -typedef struct { +typedef struct hs_ntor_intro_cell_keys_t { /* Key used for encryption of encrypted INTRODUCE1 blob */ uint8_t enc_key[CIPHER256_KEY_LEN]; /* MAC key used to protect encrypted INTRODUCE1 blob */ @@ -27,7 +27,7 @@ typedef struct { } hs_ntor_intro_cell_keys_t; /* Key material needed to encode/decode RENDEZVOUS1 cells */ -typedef struct { +typedef struct hs_ntor_rend_cell_keys_t { /* This is the MAC of the HANDSHAKE_INFO field */ uint8_t rend_cell_auth_mac[DIGEST256_LEN]; /* This is the key seed used to derive further rendezvous crypto keys as diff --git a/src/feature/hs/hs_circuit.h b/src/feature/hs/hs_circuit.h index c044ad89c..a11e9e452 100644 --- a/src/feature/hs/hs_circuit.h +++ b/src/feature/hs/hs_circuit.h @@ -70,13 +70,14 @@ bool hs_circ_is_rend_sent_in_intro1(const origin_circuit_t *circ); #ifdef HS_CIRCUIT_PRIVATE +struct hs_ntor_rend_cell_keys_t; + STATIC hs_ident_circuit_t * create_rp_circuit_identifier(const hs_service_t *service, const uint8_t *rendezvous_cookie, const curve25519_public_key_t *server_pk, - const hs_ntor_rend_cell_keys_t *keys); + const struct hs_ntor_rend_cell_keys_t *keys); #endif /* defined(HS_CIRCUIT_PRIVATE) */ #endif /* !defined(TOR_HS_CIRCUIT_H) */ -

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2020