Nick Mathewson
9fcb3ef787
Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9
2018-09-07 08:46:35 -04:00
Nick Mathewson
7e91eb83d8
Merge branch 'maint-0.3.4'
2018-09-07 08:45:10 -04:00
Nick Mathewson
df18cf0e8f
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:44:40 -04:00
Nick Mathewson
a4930de5e9
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-07 08:44:40 -04:00
Nick Mathewson
a5ed62f96c
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-07 08:44:39 -04:00
Nick Mathewson
912ae2b8dc
Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9
2018-09-07 08:44:36 -04:00
Nick Mathewson
08d5fd39d8
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:42:19 -04:00
Nick Mathewson
b6de39e5f4
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-07 08:42:19 -04:00
Nick Mathewson
a08e6e711f
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-07 08:42:19 -04:00
teor
e70cf82625
Appveyor: Disable gcc hardening in Windows 64-bit builds
...
As of August 29, 2018, Appveyor images come with gcc 8.2.0 by
default. 64-bit Windows executables compiled with gcc 8.2.0 and
tor's --enable-gcc-hardening crash.
Fixes bug 27460; bugfix on 0.3.4.1-alpha.
2018-09-07 13:52:20 +10:00
teor
d2105ff5d5
Merge branch 'bug27461-029' into bug27461-032
...
Fix a minor merge conflict due to an #endif comment.
2018-09-07 13:00:34 +10:00
teor
8ef4bb7f3e
Windows: Stop calling SetProcessDEPPolicy() on 64-bit Windows
...
It is not supported, and always fails. Some compilers warn about the
function pointer cast on 64-bit Windows.
Fixes bug 27461; bugfix on 0.2.2.23-alpha.
2018-09-07 12:58:11 +10:00
teor
9d5c6317b5
hs: Silence a spurious warning in rend_client_send_introduction()
...
gcc 8 warns that extend_info_t.nickname might be truncated by strncpy().
But it doesn't know that nickname can either contain a hex id, or a
nicknames. hex ids are only used for general and HSDir circuits.
Fixes bug 27463; bugfix on 0.1.1.2-alpha.
2018-09-07 12:40:11 +10:00
teor
3b6d1676ec
Comment: Fix typos in get_interface_addresses_win32()
...
Closes 27521.
2018-09-07 11:32:57 +10:00
teor
1570f17f97
Windows: Silence a spurious warning in the GetAdaptersAddresses cast
...
GetProcAddress() returns FARPROC, which is (long long int(*)()) on
64-bit Windows:
https://msdn.microsoft.com/en-us/library/windows/desktop/ms683212(v=vs.85).aspx
But GetAdaptersAddresses() is (long unsigned int(*)()), on both 32-bit
and 64-bit Windows:
https://docs.microsoft.com/en-us/windows/desktop/api/iphlpapi/nf-iphlpapi-getadaptersaddresses
So gcc 8 issues a spurious "incompatible function pointer" warning
about the cast to GetAdaptersAddresses_fn_t.
Silence this warning by casting to a void function pointer, before
the cast to GetAdaptersAddresses_fn_t.
This issue is already fixed by 26481 in 0.3.5 and later, by removing
the lookup and cast.
Fixes bug 27465; bugfix on 0.2.3.11-alpha.
2018-09-07 11:03:10 +10:00
Nick Mathewson
22e2403145
Revert "Avoid double-close on TCP sockets under NSS."
...
This reverts commit b5fddbd241
.
The commit here was supposed to be a solution for #27451 (fd
management with NSS), but instead it caused an assertion failure.
Fixes bug 27500; but not in any released Tor.
2018-09-06 11:06:30 -04:00
Nick Mathewson
8815960c46
Merge remote-tracking branch 'tor-github/pr/294'
2018-09-06 09:47:32 -04:00
Nick Mathewson
6edee54afa
Changes file for 25132
2018-09-06 09:31:39 -04:00
Nick Mathewson
e95b13f8ce
Merge remote-tracking branch 'ageis/control-getinfo-uptime'
2018-09-06 09:30:55 -04:00
Nick Mathewson
bcfab63ca5
Merge remote-tracking branch 'teor/ticket27467'
2018-09-06 09:24:47 -04:00
teor
d0965561a5
Remove GetAdaptersAddresses_fn_t
...
The code that used it was removed as part of the 26481 refactor.
Closes ticket 27467.
2018-09-06 12:54:03 +10:00
Nick Mathewson
b8a2bdbdc8
Backport to older NSS, which does not have SEC_DerSignDataWithAlgorithmID
2018-09-05 16:49:15 -04:00
Nick Mathewson
5656144290
Fix checkspaces
2018-09-05 16:48:53 -04:00
Nick Mathewson
710aa122e4
Suppress strict-prototypes warnings in one more batch of NSS headers
2018-09-05 16:36:18 -04:00
Nick Mathewson
8cd091a8d3
Add a last-ditch memwipe() implementation for nss+old glibc
...
On new glibc versions, there's an explicit_bzero(). With openssl,
there's openssl_memwipe().
When no other approach works, use memwipe() and a memory barrier.
2018-09-05 16:34:01 -04:00
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
d6779a9013
Stop reinstalling identical packages in our Windows CI
...
Fixes bug 27464; bugfix on 0.3.4.1-alpha.
2018-09-05 21:23:28 +10: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