torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
34,928 Commits 53 Branches 631 Tags
f46b9320ae32f00aa97a397b33eaa7abdcb47fe3
Commit Graph

1010 Commits

Author SHA1 Message Date
cypherpunks f46b9320ae buf: add BUF_MAX_LEN 2020-03-24 05:53:01 +00:00
George Kadianakis 29420ab396 Merge branch 'tor-github/pr/1788' into maint-0.4.3 2020-03-23 16:56:59 +02:00
Nick Mathewson 84f57b69f3 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-03-18 08:20:16 -04:00
Nick Mathewson 758deaa472 Merge branch 'maint-0.4.1' into maint-0.4.2 2020-03-18 08:20:16 -04:00
Nick Mathewson 4ad3f17c26 Merge branch 'maint-0.3.5' into maint-0.4.1 2020-03-18 08:20:16 -04:00
Nick Mathewson 0526801ed4 Port rsa_private_key_too_long() to work on OpenSSL 1.1.0. 2020-03-18 08:19:48 -04:00
Nick Mathewson e0d68ce84f Merge branch 'maint-0.4.2' into maint-0.4.3 2020-03-17 15:22:36 -04:00
Nick Mathewson 85141a3a74 Merge branch 'maint-0.4.1' into maint-0.4.2 2020-03-17 15:22:36 -04:00
Nick Mathewson 3c8a4b8fbd Merge branch 'trove_2020_002_041' into maint-0.4.1 2020-03-17 15:22:02 -04:00
Nick Mathewson fe3d8ec38e Merge branch 'trove_2020_002_035' into maint-0.3.5 2020-03-17 15:21:48 -04:00
Nick Mathewson e15a621ac8 Merge branch 'maint-0.4.1' into maint-0.4.2 2020-03-17 11:45:16 -04:00
Nick Mathewson 5f4e14b8c8 Merge branch 'maint-0.3.5' into maint-0.4.1 2020-03-17 11:45:16 -04:00
Nick Mathewson bbc80ea042 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-03-17 11:45:16 -04:00
George Kadianakis c940b7cf13 Trivial bugfixes found during TROVE investigation. 2020-03-17 11:43:03 -04:00
Nick Mathewson 9163781039 Merge branch 'trove_2020_002_035' into trove_2020_002_041 2020-03-17 10:45:03 -04:00
Nick Mathewson f958b537ab Use >= consistently with max_bits. 2020-03-17 10:44:38 -04:00
Nick Mathewson 8abdb39489 Extract key length check into a new function, and check more fields. 
In the openssl that I have, it should be safe to only check the size
of n.  But if I'm wrong, or if other openssls work differently, we
should check whether any of the fields are too large.

Issue spotted by Teor.
 2020-03-17 10:44:38 -04:00
Nick Mathewson dd6e2277e0 Merge branch 'trove_2020_002_035' into trove_2020_002_041 2020-03-14 14:20:51 -04:00
Nick Mathewson 29c9675bde Fix memory leak in crypto_pk_asn1_decode_private. 
(Deep, deep thanks to Taylor for reminding me to test this!)
 2020-03-14 14:17:37 -04:00
Nick Mathewson be064f77b9 Revise TROVE-2020-002 fix to work on older OpenSSL versions. 
Although OpenSSL before 1.1.1 is no longer supported, it's possible
that somebody is still using it with 0.3.5, so we probably shouldn't
break it with this fix.
 2020-03-14 13:38:53 -04:00
Nick Mathewson b2e543bfe7 Merge branch 'maint-0.3.5' into maint-0.4.1 2020-03-13 16:46:16 -04:00
Nick Mathewson 6ed2c9e5fa Merge branch 'maint-0.4.1' into maint-0.4.2 2020-03-13 16:46:16 -04:00
Nick Mathewson b9d71f3848 Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5 2020-03-13 16:46:09 -04:00
Nick Mathewson eed196f122 Merge branch 'bug33032_042' into bug33032_043 2020-03-11 10:35:47 -04:00
Nick Mathewson 554b805093 Merge branch 'bug33032_041' into bug33032_042 2020-03-11 10:35:47 -04:00
Nick Mathewson 55055396cc Merge branch 'maint-0.4.1' into bug33032_041 2020-03-11 10:35:46 -04:00
Nick Mathewson 5721ec22d8 pem_decode(): Tolerate CRLF line endings 
Fixes bug 33032; bugfix on 0.3.5.1-alpha when we introduced our own
PEM decoder.
 2020-03-11 10:35:17 -04:00
rl1987 f89c32ccd0 Document poll_interval_tv in procmon.c 2020-03-10 09:13:22 -04:00
Nick Mathewson 2c792d1e0e In typed_var_kvassign, include config names in error messages. 
This should improve the usability of our configuration error messages.
 2020-02-26 14:18:40 -05:00
Nick Mathewson 7e7aff9b6a confmgt: when a units value is invalid, include a meaningful error. 
Part of 33460.
 2020-02-26 13:03:10 -05:00
Nick Mathewson b133325a3e confmgt: when an int/enum value is invalid, say which values are ok. 
Part of 33460.
 2020-02-26 13:02:28 -05:00
Nick Mathewson d0c3350218 Run "make autostyle". 2020-02-12 18:25:51 -05:00
Nick Mathewson 1a375c3b19 Merge branch 'trove_2020_002_035' into trove_2020_002_041 
Resolved Conflicts:
	src/feature/dirparse/parsecommon.c
 2020-02-05 12:06:24 -05:00
Nick Mathewson 9e1085c924 When parsing, reject >1024-bit RSA private keys sooner. 
Private-key validation is fairly expensive for long keys in openssl,
so we need to avoid it sooner.
 2020-02-05 11:11:35 -05:00
teor ff52051754 address: Fix comments in address.h 
And improve inline function spacing, and function declaration
spacing.

Comment-only change.
 2020-02-04 14:36:04 +10:00
David Goulet a1dec44723 Merge branch 'tor-github/pr/1697' 2020-01-30 13:48:36 -05:00
Nick Mathewson af76b9dcc6 Merge branch 'bug32673_035' 2020-01-30 09:58:23 -05:00
Nick Mathewson 9ea0c0bfcd Merge branch 'bug33093_logging_035' 2020-01-30 09:55:40 -05:00
Nick Mathewson 2a1f8ea2e7 Do not set "once" when calling tor_bug_occurred_ from BUG(). 
The "once" flag makes tor_bug_occurred_() say that future instances
of the warning will be suppressed -- but that's not something that
BUG() does.  Fixes bug 33095; bugfix on 0.4.1.1-alpha.
 2020-01-30 09:43:34 -05:00
teor 7b6be02a92 Merge branch 'maint-0.4.1' into maint-0.4.2 2020-01-30 07:55:12 +10:00
teor 6b392c333a Merge branch 'maint-0.4.0' into maint-0.4.1 2020-01-30 07:55:05 +10:00
teor 65825018c7 Merge branch 'maint-0.3.5' into maint-0.4.0 2020-01-30 07:54:58 +10:00
teor 41d52e9cd8 Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5 2020-01-30 07:53:53 +10:00
Nick Mathewson 2985a6018f buf_read_from_tls: Return ERROR_MISC, not WANTWRITE, on BUG(). 
Fixes bug 32673; bugfix on 0.3.0.4-alpha.  We introduced these
checks in ee5471f9aa to help diagnose 21369, but we used "-1"
when "TOR_TLS_ERROR_MISC" would have been correct.  Found by opara.

I don't think that this is actually getting triggered in the wild,
but if it were, it could cause nasty behavior: spurious
WANTREAD/WANTWRITE returns have a way of turning into CPU-eating
busy-loops.
 2020-01-29 08:50:03 -05:00
Nick Mathewson 1f163fcbde Change BUG() messages in buf_flush_to_tls() to IF_BUG_ONCE() 
We introduced these BUG() checks in b0ddaac074 to prevent a
recurrence of bug 23690.  But there's a report of the BUG() message
getting triggered and filling up the disk.  Let's change it to
IF_BUG_ONCE().

Fixes bug 33093; bugfix on 0.3.2.2-alpha.
 2020-01-29 08:31:22 -05:00
teor fb541ffca3 Merge branch 'maint-0.4.0' into maint-0.4.1 2020-01-16 10:00:40 +10:00
teor 026f068bb3 Merge branch 'maint-0.3.5' into maint-0.4.0 2020-01-16 10:00:32 +10:00
teor 19954cffd7 Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5 2020-01-16 09:57:27 +10:00
Nick Mathewson 5e27caa60c compat_compiler: add a macro to prevent coverity deadcode warnings. 
The POSSIBLE(e) macro evaluates to the value of (e), but does so in
a way that a static analyzer will not conclude that (e) is
impossible.  We can use this when we expect our regular compilers to
eliminate deadcode, but we don't want coverity to complain about it.

Part of a fix for 32960.
 2020-01-15 10:21:18 -05:00
Nick Mathewson c948db4252 Merge remote-tracking branch 'tor-github/pr/1636' 2020-01-14 12:46:14 -05:00