Nick Mathewson
a415fee58a
Merge branch 'maint-0.2.9'
2016-11-07 09:09:06 -05:00
Nick Mathewson
0bd55ed96a
Always Use EVP_aes_*_ctr() with openssl 1.1
...
(OpenSSL 1.1 makes EVP_CIPHER_CTX opaque, _and_ adds acceleration
for counter mode on more architectures. So it won't work if we try
the older approach, and it might help if we try the newer one.)
Fixes bug 20588.
2016-11-06 21:01:25 -05:00
Nick Mathewson
61612f980d
Merge branch 'maint-0.2.9'
2016-11-06 20:24:29 -05:00
Nick Mathewson
def41e93bd
In test_tortls_classify_client_ciphers(), s/ECDH/ECDHE/
...
(We weren't actually using these ciphers; we were just requing that
ciphers of that name existed.)
Patch from rubiate. Fixes 20460
2016-11-06 20:23:40 -05:00
Nick Mathewson
b28d818423
Remove changes files that will appear in 0.2.9.5-alpha.
2016-11-06 16:57:38 -05:00
Nick Mathewson
c69bc895ca
Fix lintchanges warnings in master.
2016-11-06 16:48:52 -05:00
Nick Mathewson
c8ec42de2f
Merge branch 'maint-0.2.9'
2016-11-06 16:41:32 -05:00
Nick Mathewson
add164aa41
Fix warnings from lintChanges.py
2016-11-06 16:39:46 -05:00
Nick Mathewson
91053a072c
changes file for 20526
2016-11-03 19:10:02 -04:00
Nick Mathewson
b96bb82a2a
changes file for 19563
2016-11-03 18:41:40 -04:00
Nick Mathewson
59f4cae68c
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-11-03 18:36:43 -04:00
Nick Mathewson
61bdc452b0
Merge branch 'bug20551_028' into maint-0.2.8
2016-11-03 18:36:25 -04:00
Nick Mathewson
272572c3a2
Merge branch 'maint-0.2.9'
2016-11-03 15:45:16 -04:00
Nick Mathewson
3cd520a52d
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-11-03 15:44:46 -04:00
Nick Mathewson
7a45ef5a47
Merge remote-tracking branch 'arma/bug19969_028_squashed' into maint-0.2.8
2016-11-03 15:44:30 -04:00
Nick Mathewson
3bb49c0110
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-11-03 15:41:04 -04:00
Nick Mathewson
957bdc4a42
Merge branch 'bug20553_028'
2016-11-03 10:52:21 -04:00
Nick Mathewson
9b18b215bb
Work around a behavior change in openssl's BUF_MEM code
...
In our code to write public keys to a string, for some unfathomable
reason since 253f0f160e
, we would allocate a memory BIO, then
set the NOCLOSE flag on it, extract its memory buffer, and free it.
Then a little while later we'd free the memory buffer with
BUF_MEM_free().
As of openssl 1.1 this doesn't work any more, since there is now a
BIO_BUF_MEM structure that wraps the BUF_MEM structure. This
BIO_BUF_MEM doesn't get freed in our code.
So, we had a memory leak!
Is this an openssl bug? Maybe. But our code was already pretty
silly. Why mess around with the NOCLOSE flag here when we can just
keep the BIO object around until we don't need the buffer any more?
Fixes bug 20553; bugfix on 0.0.2pre8
2016-11-03 10:51:10 -04:00
Nick Mathewson
1eef543f9d
Merge branch 'bug20551_028'
2016-11-03 09:37:44 -04:00
Nick Mathewson
464783a8dc
Use explicit casts to avoid warnings when building with openssl 1.1
...
fixes bug 20551; bugfix on 0.2.1.1-alpha
2016-11-03 09:35:41 -04:00
Nick Mathewson
d9ca4e20bd
Merge branch 'feature_15055_v2'
2016-11-03 08:44:46 -04:00
Nick Mathewson
53656381df
Changes file for 15055 branch.
2016-11-03 08:40:10 -04:00
Nick Mathewson
e64bac6eb4
Increase TLS RSA link key length to 2048 bits
...
Oddly, nothing broke.
Closes ticket 13752.
2016-11-03 08:39:30 -04:00
Nick Mathewson
0704fa8a63
Handle u32 overflow in ed25519 cert expiration time.
...
The impact here isn't too bad. First, the only affected certs that
expire after 32-bit signed time overflows in Y2038. Second, it could
only make it seem that a non-expired cert is expired: it could never
make it seem that an expired cert was still live.
Fixes bug 20027; bugfix on 0.2.7.2-alpha.
2016-11-03 08:37:22 -04:00
Nick Mathewson
e94f1b4e0d
Free rsa_ed_crosscert at exit.
...
Fixes bug 17779; bugfix on 0.2.7.2-alpha.
2016-11-03 08:37:21 -04:00
Roger Dingledine
d89804a69d
Ask event_base_loop to finish when we add a pending stream
...
Fixes bug 19969; bugfix on b1d56fc58
. We can fix this some more in
later Tors, but for now, this is probably the right fix for us.
2016-11-01 19:52:55 -04:00
Nick Mathewson
cb35a7c271
Merge branch 'maint-0.2.9'
2016-11-01 13:05:45 -04:00
Nick Mathewson
733b245283
Merge remote-tracking branch 'teor/bug20472-029-v2' into maint-0.2.9
2016-11-01 13:05:33 -04:00
Nick Mathewson
db67867a81
Merge remote-tracking branch 'pastly/ticket20486'
2016-11-01 12:55:14 -04:00
Nick Mathewson
e6d84ac04f
Merge branch 'maint-0.2.9'
2016-11-01 12:49:13 -04:00
Nick Mathewson
9248466f0a
Merge branch 'bug20487_029' into maint-0.2.9
2016-11-01 12:44:20 -04:00
Matt Traudt
d8d6d8c206
Update man page that HS directory does not need to exist
2016-11-01 12:32:50 -04:00
Nick Mathewson
68a27dad43
Merge branch 'maint-0.2.9'
2016-10-31 16:33:12 -04:00
Nick Mathewson
e712b5d784
Merge branch 'bug19968_029' into maint-0.2.9
2016-10-31 16:33:03 -04:00
Nick Mathewson
59a78187cd
Merge branch 'maint-0.2.9'
2016-10-31 15:20:45 -04:00
Nick Mathewson
24b7b922ae
Actually free the worker_state_t object when we do an update with it
...
Previously we freed the old "keys" object, but leaked the
worker_state_t that we had taken it from.
Fixes bug 20401; bugfix on 0.2.6.3-alpha.
2016-10-31 15:20:25 -04:00
Nick Mathewson
b858452f94
Add a sentence to the manpage about nonanonymous=>Socksport 0.
...
Closes 20487.
2016-10-31 15:13:27 -04:00
Nick Mathewson
becc957839
Actually clamp the number of detected CPUs to 16.
...
Previously we said we did, but didn't.
Fixes #19968 ; bugfix on 0.2.3.1-alpha.
2016-10-31 14:19:39 -04:00
teor
26d7a07ad7
In circuit_pick_extend_handshake, assume all hops support EXTEND2 and ntor
...
This simplifies the function: if we have an ntor key, use ntor/EXTEND2,
otherwise, use TAP/EXTEND.
Bugfix on commit 10aa913
from 19163 in 0.2.9.3-alpha.
2016-10-31 17:01:04 +11:00
overcaffeinated
b8b8b6b70e
Add implementation of smartlist_add_strdup
...
Add smartlist_add_strdup(sl, string) - replaces the use of
smartlist_add(sl, tor_strdup(string)). Fixes bug 20048.
2016-10-27 10:12:28 +01:00
Matt Traudt
6629c5c3fe
Add historic bwweight tests, comments, line len fixes
2016-10-26 16:37:16 -04:00
Matt Traudt
7ba0ae9426
Add consensus weight calculation tests
2016-10-26 16:37:16 -04:00
Matt Traudt
909ee0e55f
Fix default bw weights with new consensus method
...
See #14881
2016-10-26 16:33:54 -04:00
Nick Mathewson
39375db3dc
Merge remote-tracking branch 'pastly/ticket20459'
2016-10-26 16:22:06 -04:00
Nick Mathewson
5a1779b7ff
Merge branch 'maint-0.2.9'
2016-10-26 14:17:21 -04:00
Nick Mathewson
d288704023
Avoid tor_fragile_assert() failure with DNSPort on RESOLVED_TYPE_ERROR
...
The tor_fragile_assert() bug has existed here since c8a5e2d588
in tor-0.2.1.7-alpha forever, but tor_fragile_assert() was mostly a
no-op until 0.2.9.1-alpha.
Fixes bug 19869.
2016-10-26 14:16:40 -04:00
Matt Traudt
c09993fdf6
Fix ewma_cmp_cmux never considering policies different
2016-10-25 10:07:05 -04:00
Nick Mathewson
01482e30ad
Merge remote-tracking branch 'pastly/ticket20273'
2016-10-24 12:47:29 -04:00
David Goulet
59247314d5
man: Fix default value of AuthDirGuardBWGuarantee to 2MB
...
Closes #20435
Signed-off-by: David Goulet <dgoulet@torproject.org>
2016-10-23 10:59:55 -04:00
Nick Mathewson
7010e85939
changes file for 20389
2016-10-19 18:07:02 -04:00