]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoBump to 0.3.4.8
Nick Mathewson [Fri, 7 Sep 2018 13:49:29 +0000 (09:49 -0400)] 
Bump to 0.3.4.8

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 7 Sep 2018 13:15:56 +0000 (09:15 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 13:15:56 +0000 (09:15 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 13:15:52 +0000 (09:15 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'ticket27344_029' into maint-0.2.9
Nick Mathewson [Fri, 7 Sep 2018 13:15:15 +0000 (09:15 -0400)] 
Merge branch 'ticket27344_029' into maint-0.2.9

7 years agoTell openssl to build its TLS contexts with security level 1
Nick Mathewson [Fri, 7 Sep 2018 12:57:14 +0000 (08:57 -0400)] 
Tell openssl to build its TLS contexts with security level 1

Fixes bug 27344, where we'd break compatibility with old tors by
rejecting RSA1024 and DH1024.

7 years agoMerge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4
Nick Mathewson [Fri, 7 Sep 2018 12:48:19 +0000 (08:48 -0400)] 
Merge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 12:46:45 +0000 (08:46 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 12:46:45 +0000 (08:46 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 7 Sep 2018 12:46:45 +0000 (08:46 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 12:46:41 +0000 (08:46 -0400)] 
Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2

7 years agoMerge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9
Nick Mathewson [Fri, 7 Sep 2018 12:46:35 +0000 (08:46 -0400)] 
Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 12:44:40 +0000 (08:44 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 7 Sep 2018 12:44:40 +0000 (08:44 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 12:44:39 +0000 (08:44 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9
Nick Mathewson [Fri, 7 Sep 2018 12:44:36 +0000 (08:44 -0400)] 
Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 12:42:19 +0000 (08:42 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 7 Sep 2018 12:42:19 +0000 (08:42 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 12:42:19 +0000 (08:42 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoAppveyor: Disable gcc hardening in Windows 64-bit builds
teor [Wed, 5 Sep 2018 08:32:46 +0000 (18:32 +1000)] 
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.

7 years agoMerge branch 'bug27461-029' into bug27461-032
teor [Fri, 7 Sep 2018 03:00:34 +0000 (13:00 +1000)] 
Merge branch 'bug27461-029' into bug27461-032

Fix a minor merge conflict due to an #endif comment.

7 years agoWindows: Stop calling SetProcessDEPPolicy() on 64-bit Windows
teor [Fri, 7 Sep 2018 02:58:11 +0000 (12:58 +1000)] 
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.

7 years agohs: Silence a spurious warning in rend_client_send_introduction()
teor [Wed, 5 Sep 2018 11:07:58 +0000 (21:07 +1000)] 
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.

7 years agoWindows: Silence a spurious warning in the GetAdaptersAddresses cast
teor [Thu, 6 Sep 2018 03:11:23 +0000 (13:11 +1000)] 
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.

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 5 Sep 2018 14:16:06 +0000 (10:16 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 5 Sep 2018 14:15:45 +0000 (10:15 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 5 Sep 2018 14:15:42 +0000 (10:15 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9
Nick Mathewson [Wed, 5 Sep 2018 14:14:56 +0000 (10:14 -0400)] 
Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9

7 years agoMerge remote-tracking branch 'teor/ticket27449-034' into maint-0.3.4
Nick Mathewson [Wed, 5 Sep 2018 14:01:27 +0000 (10:01 -0400)] 
Merge remote-tracking branch 'teor/ticket27449-034' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 5 Sep 2018 13:56:19 +0000 (09:56 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 5 Sep 2018 13:56:19 +0000 (09:56 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 5 Sep 2018 13:56:19 +0000 (09:56 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoTravis: don't call echo with a --flag as the first argument
teor [Wed, 5 Sep 2018 03:30:17 +0000 (13:30 +1000)] 
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.

7 years agoAppveyor: tail config.log and cat test-suite.log after failed builds
teor [Wed, 5 Sep 2018 00:44:01 +0000 (10:44 +1000)] 
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.

7 years agoTravis: when showing a log fails, keep trying to show other logs
teor [Wed, 5 Sep 2018 03:12:54 +0000 (13:12 +1000)] 
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.

7 years agoAppveyor: always log the compiler path and version
teor [Wed, 5 Sep 2018 00:17:39 +0000 (10:17 +1000)] 
Appveyor: always log the compiler path and version

Implements 27449.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 29 Aug 2018 15:17:31 +0000 (11:17 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 29 Aug 2018 15:17:31 +0000 (11:17 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 29 Aug 2018 15:17:31 +0000 (11:17 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoTest: avoid spurious failures in make test-network-all
teor [Fri, 24 Aug 2018 00:25:25 +0000 (10:25 +1000)] 
Test: avoid spurious failures in make test-network-all

Before running make test-network-all, delete old logs and test result
files, to avoid spurious failures.

Fixes bug 27295; bugfix on 0.2.7.3-rc.

7 years agoTest: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am
teor [Fri, 24 Aug 2018 00:20:30 +0000 (10:20 +1000)] 
Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

Part of 27295.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Mon, 27 Aug 2018 13:39:08 +0000 (09:39 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 27 Aug 2018 13:39:08 +0000 (09:39 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoWhen running make test-network-all, use the mixed+hs-v2 network
teor [Mon, 27 Aug 2018 13:06:04 +0000 (23:06 +1000)] 
When running make test-network-all, use the mixed+hs-v2 network

No behaviour change.

A previous fix to chutney removed v3 onion services from the
mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
confusing.

Fixes bug 27345; bugfix on 0.3.2.1-alpha.

7 years agoUpdate to 0.3.4.7-rc-dev
Nick Mathewson [Fri, 24 Aug 2018 20:49:56 +0000 (16:49 -0400)] 
Update to 0.3.4.7-rc-dev

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 24 Aug 2018 16:33:20 +0000 (12:33 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 24 Aug 2018 16:32:10 +0000 (12:32 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'ticket27286_032_v2' into maint-0.3.2
Nick Mathewson [Fri, 24 Aug 2018 16:32:06 +0000 (12:32 -0400)] 
Merge branch 'ticket27286_032_v2' into maint-0.3.2

7 years agoUpdate the protocol versions recommendations to remove LinkAuth=1
Nick Mathewson [Thu, 23 Aug 2018 15:24:39 +0000 (11:24 -0400)] 
Update the protocol versions recommendations to remove LinkAuth=1

LinkAuth method 1 is the one where we pull the TLS master secrets
out of the OpenSSL data structures and authenticate them with
RSA. Right now we list method 1 as required for clients and relays.
That's a problem, since we can't reasonably support it with NSS. So
let's remove it as a requirement and a recommendation.

As for method 3: I'd like to recommend it it, but that would make
0.2.9 start warning.  Let's not do that till at least some time
after 0.3.5 (the next LTS) is stable.

Closes ticket 27286

7 years agoBootstrap: add some extra logging
teor [Fri, 24 Aug 2018 15:11:44 +0000 (01:11 +1000)] 
Bootstrap: add some extra logging

Diagnostics for 27236.

7 years agoBootstrap: allow internal-only onion service networks to bootstrap
teor [Fri, 24 Aug 2018 15:08:53 +0000 (01:08 +1000)] 
Bootstrap: allow internal-only onion service networks to bootstrap

This fix requires chutney's 27230 fix to bridge client bootstrap.

Part of 27236.

7 years agoBump to 0.3.4.7-rc
Nick Mathewson [Fri, 24 Aug 2018 13:13:20 +0000 (09:13 -0400)] 
Bump to 0.3.4.7-rc

7 years agoBootstrap: stop requiring descriptors to count exits as usable
teor [Fri, 24 Aug 2018 01:55:41 +0000 (11:55 +1000)] 
Bootstrap: stop requiring descriptors to count exits as usable

Instead, count exits as usable if they have the exit flag, and
present if they also have a non-reject exit policy.

Requiring a threshold of usable descriptors avoids directories trickling
exit descriptors to clients to discover their ExitNodes settings.

Part of 27236.

7 years agoMerge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4
Nick Mathewson [Fri, 24 Aug 2018 00:44:06 +0000 (20:44 -0400)] 
Merge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4

7 years agoAppveyor CI: always use HEAD for the short commit
teor [Tue, 31 Jul 2018 02:14:40 +0000 (12:14 +1000)] 
Appveyor CI: always use HEAD for the short commit

Part of 26979.

7 years agoAppveyor CI: Changes file for 26979
teor [Tue, 31 Jul 2018 01:58:04 +0000 (11:58 +1000)] 
Appveyor CI: Changes file for 26979

Closes 26979.

7 years agoAppveyor CI: sort environmental variables
teor [Tue, 31 Jul 2018 01:54:02 +0000 (11:54 +1000)] 
Appveyor CI: sort environmental variables

To avoid future duplicates.

7 years agoAppveyor CI: fix some typos
teor [Tue, 31 Jul 2018 01:49:11 +0000 (11:49 +1000)] 
Appveyor CI: fix some typos

7 years agoAppveyor CI: Generate correct tag names
teor [Tue, 31 Jul 2018 01:47:33 +0000 (11:47 +1000)] 
Appveyor CI: Generate correct tag names

Part of 26979.

7 years agoAppveyor CI: Switch to one URL per line
teor [Tue, 31 Jul 2018 01:37:11 +0000 (11:37 +1000)] 
Appveyor CI: Switch to one URL per line

Part of 26979.

7 years agoAppveyor CI: Generate correct branches and URLs for pull requests
teor [Tue, 31 Jul 2018 01:12:21 +0000 (11:12 +1000)] 
Appveyor CI: Generate correct branches and URLs for pull requests

Part of 26979.

7 years agoAppveyor CI: Make short commits 10 hexdigits long
teor [Tue, 31 Jul 2018 01:10:55 +0000 (11:10 +1000)] 
Appveyor CI: Make short commits 10 hexdigits long

That's what git does for tor.

Part of 26979.

7 years agoAppveyor CI: Fix GitHub provider detection
teor [Tue, 31 Jul 2018 01:09:54 +0000 (11:09 +1000)] 
Appveyor CI: Fix GitHub provider detection

Part of 26979.

7 years agoMerge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4
Nick Mathewson [Fri, 24 Aug 2018 00:07:39 +0000 (20:07 -0400)] 
Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4

7 years agoCI: Only post Appveyor IRC notifications when the build fails
teor [Wed, 22 Aug 2018 23:39:36 +0000 (09:39 +1000)] 
CI: Only post Appveyor IRC notifications when the build fails

Implements 27275.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 23 Aug 2018 23:36:45 +0000 (19:36 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Thu, 23 Aug 2018 23:36:45 +0000 (19:36 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Thu, 23 Aug 2018 23:36:45 +0000 (19:36 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoSilence a compilation warning on MSVC 2017 and clang-cl
teor [Thu, 23 Aug 2018 08:55:39 +0000 (18:55 +1000)] 
Silence a compilation warning on MSVC 2017 and clang-cl

test.c no longer uses lround(), so we don't need to declare it,
and we can use math.h for fabs().

Fixes bug 27185; bugfix on 0.2.2.2-alpha.

7 years agoMerge remote-tracking branch 'teor/bug27236-034' into maint-0.3.4
Nick Mathewson [Thu, 23 Aug 2018 18:22:30 +0000 (14:22 -0400)] 
Merge remote-tracking branch 'teor/bug27236-034' into maint-0.3.4

7 years agoBootstrap: check the exit policy and flag on descriptors
teor [Thu, 23 Aug 2018 14:10:52 +0000 (00:10 +1000)] 
Bootstrap: check the exit policy and flag on descriptors

Previously, Tor would only check the exit flag. In small networks, Tor
could bootstrap once it received a consensus with exits, without fetching
the new descriptors for those exits.

After bootstrap, Tor delays descriptor fetches, leading to failures in
fast networks like chutney.

Fixes 27236; bugfix on 0.2.6.3-alpha.

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 22 Aug 2018 13:37:31 +0000 (09:37 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 22 Aug 2018 13:37:31 +0000 (09:37 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 22 Aug 2018 13:37:31 +0000 (09:37 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMark cert_matches_key as not-intrusive; fix stretch compilation.
Nick Mathewson [Wed, 22 Aug 2018 13:37:26 +0000 (09:37 -0400)] 
Mark cert_matches_key as not-intrusive; fix stretch compilation.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 22 Aug 2018 00:04:17 +0000 (20:04 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 22 Aug 2018 00:04:17 +0000 (20:04 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4
Nick Mathewson [Wed, 22 Aug 2018 00:04:03 +0000 (20:04 -0400)] 
Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4

7 years agoMerge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3
Nick Mathewson [Wed, 22 Aug 2018 00:03:56 +0000 (20:03 -0400)] 
Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 22 Aug 2018 00:03:46 +0000 (20:03 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2
Nick Mathewson [Wed, 22 Aug 2018 00:03:41 +0000 (20:03 -0400)] 
Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2

7 years agoMerge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9
Nick Mathewson [Wed, 22 Aug 2018 00:03:19 +0000 (20:03 -0400)] 
Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Tue, 21 Aug 2018 23:20:31 +0000 (19:20 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Tue, 21 Aug 2018 23:16:40 +0000 (19:16 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Tue, 21 Aug 2018 23:16:40 +0000 (19:16 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Tue, 21 Aug 2018 14:01:41 +0000 (10:01 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoAdd changes file for 26873. I missed this when merging earlier.
Nick Mathewson [Tue, 21 Aug 2018 14:01:38 +0000 (10:01 -0400)] 
Add changes file for 26873. I missed this when merging earlier.

7 years agoRewrite test_tortls_cert_matches_key()
Nick Mathewson [Mon, 20 Aug 2018 21:43:41 +0000 (17:43 -0400)] 
Rewrite test_tortls_cert_matches_key()

Unlike the old test, this test no will no longer mess around with
the forbidden internals of any openssl data structures.

Additionally, it verifies several other behaviors of
tor_tls_cert_matches_key() that we had wanted to verify, such as
the possibility of the certificate's key not matching.

Fixes bug 27226; bugfix on 0.2.5.1-alpha.

7 years agoUse our x509 wrapper code in tor_tls_cert_matches_key()
Nick Mathewson [Mon, 20 Aug 2018 21:42:38 +0000 (17:42 -0400)] 
Use our x509 wrapper code in tor_tls_cert_matches_key()

This allows us to mock our own tor_tls_get_peer_certificate()
function in order to test ..cert_matches_key(), which will in turn
allow us to simplify test_tortls_cert_matches_key() considerably.

Prep work for the fix for 27226.

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 17 Aug 2018 13:38:26 +0000 (09:38 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3
Nick Mathewson [Fri, 17 Aug 2018 13:38:08 +0000 (09:38 -0400)] 
Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3

7 years agorust/protover: don't accept whitespace in ProtoSet::from_str()
cypherpunks [Fri, 17 Aug 2018 03:22:47 +0000 (03:22 +0000)] 
rust/protover: don't accept whitespace in ProtoSet::from_str()

It's impossible for spaces to get here, since spaces are used as
separators between individual protocol entries higher up.

And it shouldn't ignore whitespace that isn't a literal space
character, because that would differ from the C implementation.

These were added in 9925d2e68709aa7346f4c5bc98ea1349df6741f3.

Fixes #27177. Bugfix on 0.3.3.5-rc.

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 17 Aug 2018 13:29:46 +0000 (09:29 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agorust/protover: fix hyphen parsing bug in ProtoSet::from_str()
cypherpunks [Tue, 7 Aug 2018 00:45:33 +0000 (00:45 +0000)] 
rust/protover: fix hyphen parsing bug in ProtoSet::from_str()

It was parsing "1-2-3" as if it were 1-2, ignoring the 2nd hyphen
and everything after.

Introduced in d1820c1516a31a149fc51a9e5126bf899e4c4e08.

Fixes #27164; bugfix on 0.3.3.1-alpha.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 16 Aug 2018 12:37:11 +0000 (08:37 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Thu, 16 Aug 2018 12:37:11 +0000 (08:37 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoKeep descriptor rotation time after HUP occurs.
George Kadianakis [Sat, 28 Jul 2018 15:31:46 +0000 (17:31 +0200)] 
Keep descriptor rotation time after HUP occurs.

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Thu, 16 Aug 2018 12:35:31 +0000 (08:35 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 16 Aug 2018 12:35:27 +0000 (08:35 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoRust: Say that we support rust stable in GettingStartedRust.md
teor [Thu, 16 Aug 2018 08:58:47 +0000 (18:58 +1000)] 
Rust: Say that we support rust stable in GettingStartedRust.md

In 24765, we said that we supported rust stable in CodingStandardsRust.md.
But we left GettingStartedRust.md saying that we support rust nightly.

Closes 27160.