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

Run "make autostyle"

Browse Source
This commit is contained in:
teor 2020-04-29 22:07:35 +10:00
parent 6eec43161a
commit 3253c357ee
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/feature/dircache/conscache.c
View File

@ -139,7 +139,7 @@ consensus_cache_may_overallocate(consensus_cache_t *cache)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-attribute=noreturn" #pragma GCC diagnostic ignored "-Wsuggest-attribute=noreturn"
#endif #endif
#endif #endif /* defined(_WIN32) */
/** /**
* Tell the sandbox (if any) configured by <b>cfg</b> to allow the * Tell the sandbox (if any) configured by <b>cfg</b> to allow the

2
src/feature/hs/hs_opts_st.h
View File

@ -27,4 +27,4 @@
**/ **/
typedef struct hs_opts_t hs_opts_t; typedef struct hs_opts_t hs_opts_t;
#endif #endif /* !defined(TOR_FEATURE_HS_HS_OPTS_ST_H) */

8
src/lib/crypt_ops/crypto_rsa_openssl.c
View File

@ -583,15 +583,15 @@ rsa_private_key_too_long(RSA *rsa, int max_bits)
dmp1 = RSA_get0_dmp1(rsa); dmp1 = RSA_get0_dmp1(rsa);
dmq1 = RSA_get0_dmq1(rsa); dmq1 = RSA_get0_dmq1(rsa);
iqmp = RSA_get0_iqmp(rsa); iqmp = RSA_get0_iqmp(rsa);
#else #else /* !(OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,1)) */
/* The accessors above did not exist in openssl 1.1.0. */ /* The accessors above did not exist in openssl 1.1.0. */
p = q = dmp1 = dmq1 = iqmp = NULL; p = q = dmp1 = dmq1 = iqmp = NULL;
RSA_get0_key(rsa, &n, &e, &d); RSA_get0_key(rsa, &n, &e, &d);
#endif #endif /* OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,1) */
if (RSA_bits(rsa) > max_bits) if (RSA_bits(rsa) > max_bits)
return true; return true;
#else #else /* !defined(OPENSSL_1_1_API) */
n = rsa->n; n = rsa->n;
e = rsa->e; e = rsa->e;
p = rsa->p; p = rsa->p;
@ -600,7 +600,7 @@ rsa_private_key_too_long(RSA *rsa, int max_bits)
dmp1 = rsa->dmp1; dmp1 = rsa->dmp1;
dmq1 = rsa->dmq1; dmq1 = rsa->dmq1;
iqmp = rsa->iqmp; iqmp = rsa->iqmp;
#endif #endif /* defined(OPENSSL_1_1_API) */
if (n && BN_num_bits(n) > max_bits) if (n && BN_num_bits(n) > max_bits)
return true; return true;

2
src/lib/subsys/subsys.h
View File

@ -198,7 +198,7 @@ typedef struct subsys_fns_t {
**/ **/
#define SUBSYS_DECLARE_LOCATION() \ #define SUBSYS_DECLARE_LOCATION() \
.location = __FILE__ .location = __FILE__
#endif #endif /* !defined(COCCI) */
/** /**
* Lowest allowed subsystem level. * Lowest allowed subsystem level.

2
src/test/test_circuitbuild.c
View File

@ -133,7 +133,7 @@ test_new_route_len_unhandled_exit(void *arg)
#if !defined(__COVERITY__) && !defined(__clang_analyzer__) #if !defined(__COVERITY__) && !defined(__clang_analyzer__)
tt_skip(); tt_skip();
#endif #endif
#endif #endif /* defined(ALL_BUGS_ARE_FATAL) */
MOCK(count_acceptable_nodes, mock_count_acceptable_nodes); MOCK(count_acceptable_nodes, mock_count_acceptable_nodes);

4
src/test/test_dir.c
View File

@ -3041,7 +3041,7 @@ test_dir_param_voting_lookup(void *arg)
tt_str_op(smartlist_get(tor_get_captured_bug_log_(), 0), OP_EQ, tt_str_op(smartlist_get(tor_get_captured_bug_log_(), 0), OP_EQ,
"!(!ok)"); "!(!ok)");
tor_end_capture_bugs_(); tor_end_capture_bugs_();
#endif #endif /* !defined(ALL_BUGS_ARE_FATAL) */
done: done:
SMARTLIST_FOREACH(lst, char *, cp, tor_free(cp)); SMARTLIST_FOREACH(lst, char *, cp, tor_free(cp));
@ -4997,7 +4997,7 @@ test_dir_purpose_needs_anonymity_returns_true_by_default(void *arg)
#if !defined(__COVERITY__) && !defined(__clang_analyzer__) #if !defined(__COVERITY__) && !defined(__clang_analyzer__)
tt_skip(); tt_skip();
#endif #endif
#endif #endif /* defined(ALL_BUGS_ARE_FATAL) */
tor_capture_bugs_(1); tor_capture_bugs_(1);
setup_full_capture_of_logs(LOG_WARN); setup_full_capture_of_logs(LOG_WARN);

2
src/test/test_hs_intropoint.c
View File

@ -764,7 +764,7 @@ test_introduce1_validation(void *arg)
ret = validate_introduce1_parsed_cell(cell); ret = validate_introduce1_parsed_cell(cell);
tor_end_capture_bugs_(); tor_end_capture_bugs_();
tt_int_op(ret, OP_EQ, -1); tt_int_op(ret, OP_EQ, -1);
#endif #endif /* !defined(ALL_BUGS_ARE_FATAL) */
/* Reset legacy ID and make sure it's correct. */ /* Reset legacy ID and make sure it's correct. */
memset(cell->legacy_key_id, 0, sizeof(cell->legacy_key_id)); memset(cell->legacy_key_id, 0, sizeof(cell->legacy_key_id));