Nick Mathewson
06c14f9209
Merge branch 'maint-0.3.4'
2018-09-05 10:16:11 -04:00
Nick Mathewson
2b04163666
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-05 10:16:06 -04:00
Nick Mathewson
a7e72f0c44
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-05 10:15:45 -04:00
Nick Mathewson
57b207efa4
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-05 10:15:42 -04:00
Nick Mathewson
ff1486385a
Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9
2018-09-05 10:14:56 -04:00
Nick Mathewson
75da2045c5
Merge branch 'maint-0.3.4'
2018-09-05 10:01:31 -04:00
Nick Mathewson
b390983b27
Merge remote-tracking branch 'teor/ticket27449-034' into maint-0.3.4
2018-09-05 10:01:27 -04:00
Nick Mathewson
67bdd144bd
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-05 09:56:19 -04:00
Nick Mathewson
2b1b8bf2ca
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-05 09:56:19 -04:00
Nick Mathewson
2f618094d2
Merge branch 'maint-0.3.4'
2018-09-05 09:56:19 -04:00
Nick Mathewson
4ab033c3bc
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-05 09:56:19 -04:00
Nick Mathewson
824160fd82
Fix a type, and hopefully the win64 builds.
2018-09-05 09:36:15 -04:00
Nick Mathewson
dc7c979453
Add note about use of tor_memcmp()
2018-09-05 09:11:53 -04:00
Nick Mathewson
79a7fbb79b
Fix a reverse-inull warning from coverity in new code.
2018-09-05 08:34:14 -04:00
Nick Mathewson
3b61bdb5ae
Try to fix new coverity warnings in unit tests.
2018-09-05 08:30:35 -04:00
teor
35b0ac8d84
Travis: don't call echo with a --flag as the first argument
...
When we use echo in Travis, don't pass a --flag as the first argument.
Fixes bug 27418; bugfix on 0.3.4.7-rc.
2018-09-05 14:02:46 +10:00
teor
d3a3ac013d
Appveyor: tail config.log and cat test-suite.log after failed builds
...
Also zip the full logs, and upload them as build artifacts.
Implements ticket 27430.
2018-09-05 13:51:12 +10:00
teor
4e4b6a2476
Travis: when showing a log fails, keep trying to show other logs
...
When a Travis build fails, and showing a log fails, keep trying to
show the other logs.
Fixes bug 27453; bugfix on 0.3.4.7-rc.
2018-09-05 13:12:54 +10:00
teor
90e038e732
Appveyor: always log the compiler path and version
...
Implements 27449.
2018-09-05 10:50:17 +10:00
Nick Mathewson
03efb67b42
Debug one last reference-counting issue that only appeared on openssl master
2018-09-04 20:46:46 -04:00
Nick Mathewson
eeba944ee0
Fix an easy refcounting bug in a unit test
2018-09-04 20:25:25 -04:00
Nick Mathewson
0db5c54957
Merge branch 'nss_squashed' into nss_merge
2018-09-04 20:21:07 -04:00
Nick Mathewson
d644c93ae9
Resolve openssl-only memory leaks
2018-09-04 19:45:28 -04:00
Nick Mathewson
c50537fd94
Fix a pair of remaining leaks in tortls_nss.c
...
Fun fact: PR_Close leaks memory if its socket is not valid.
2018-09-04 19:45:21 -04:00
Nick Mathewson
274efb1263
Use FREE_AND_NULL for impl types
2018-09-04 14:52:35 -04:00
Nick Mathewson
ad94d43fc5
Port test_tortls_verify to not depend on openssl internals
2018-09-04 14:52:35 -04:00
Nick Mathewson
59c1b34b72
Remove tor_tls_check_lifetime as unused.
...
Everything that might have used it, uses tor_tls_cert_is_valid() instead.
2018-09-04 14:52:35 -04:00
Nick Mathewson
3cdf0497f9
Add unit test for bridge-style TLS initialization.
2018-09-04 14:52:35 -04:00
Nick Mathewson
7acb8c8d18
Document winsock includes better
2018-09-04 14:52:35 -04:00
Nick Mathewson
70c27b7e39
Fix documentation of initialized fields in crypto_init.c
2018-09-04 14:52:35 -04:00
Nick Mathewson
3b10108a2a
Fix documentation of ENABLE_NSS
2018-09-04 14:52:35 -04:00
Nick Mathewson
edbb5ef5b2
Make some additional RSA functions const
2018-09-04 14:52:35 -04:00
Nick Mathewson
600e046ed3
Rename crypto_pk_check_key(), use it more reasonably, add tests
...
This function was a wrapper around RSA_check_key() in openssl, which
checks for invalid RSA private keys (like those where p or q are
composite, or where d is not the inverse of e, or where n != p*q).
We don't need a function like this in NSS, since unlike OpenSSL, NSS
won't let you import a bogus private key.
I've renamed the function and changed its return type to make it
more reasonable, and added a unit test for trying to read a key
where n != p*q.
2018-09-04 14:52:35 -04:00
Nick Mathewson
3b5d6ef15b
Unify functions for reading/writing PEM keys, to avoid duplication.
2018-09-04 14:52:35 -04:00
Nick Mathewson
b892133fb9
Do not leave a certificate allocated after testing dirvote_add()
2018-09-04 14:52:35 -04:00
Nick Mathewson
f46a7eafb8
Do not leak a reference to "slot" when decoding private key.
2018-09-04 14:52:35 -04:00
Nick Mathewson
36f3bdac03
Update prefork and postfork NSS code for unit tests.
2018-09-04 14:52:35 -04:00
Nick Mathewson
52ac539b99
Test a few more tortls.c functions
2018-09-04 14:52:35 -04:00
Nick Mathewson
7163389b55
Several unit tests to improve test coverage of x509*.c
2018-09-04 14:52:35 -04:00
Nick Mathewson
02086a216f
Remove tor_x509_get_cert_impl as unneeded.
2018-09-04 14:52:35 -04:00
Nick Mathewson
b5fddbd241
Avoid double-close on TCP sockets under NSS.
2018-09-04 14:52:35 -04:00
Nick Mathewson
c18967d6c8
changes file for our NSS support
2018-09-04 14:52:35 -04:00
Nick Mathewson
52d5f4da12
Avoid spurious error logs when using NSS
...
The tls_log_errors() function now behaves differently for NSS than
it did for OpenSSL, so we need to tweak it a bit.
2018-09-04 14:52:35 -04:00
Nick Mathewson
dd04fc35c6
Remove tor_tls_shutdown()
...
This function was supposed to implement a half-duplex mode for our
TLS connections. However, nothing in Tor actually uses it (besides
some unit tests), and the implementation looks really questionable
to me. It's probably best to remove it. We can add a tested one
later if we need one in the future.
2018-09-04 14:52:35 -04:00
Nick Mathewson
5205c7fd90
Initial NSS support for TLS.
...
This is enough to get a chutney network to bootstrap, though a bunch
of work remains.
2018-09-04 14:52:35 -04:00
Nick Mathewson
fd994f55c4
Merge remote-tracking branch 'rl1987/doc26908'
2018-09-04 11:08:49 -04:00
Nick Mathewson
1e71e2c104
c99 style in loop
2018-09-04 11:04:55 -04:00
Nick Mathewson
3507fead10
Merge branch 'tor_api_owning_control'
2018-09-04 11:04:21 -04:00
Nick Mathewson
94b04d6c64
Merge branch 'bug24104_029_squashed'
2018-09-04 10:44:36 -04:00
rl1987
19f73f6336
Add changes file
2018-09-02 21:14:03 +03:00