March 2020 - tor-commits - lists.torproject.org

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 17 Mar '20

17 Mar '20

commit 0d2dcc15c079520d77458347c57622f4498008db Merge: 015d5152f e15a621ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 11:45:16 2020 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/trove_2020_003 | 4 ++++ src/feature/hs/hs_client.c | 6 +++--- src/feature/hs/hs_service.c | 6 ++++++ src/lib/crypt_ops/crypto_ed25519.c | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 17 Mar '20

17 Mar '20

commit e15a621ac81c472f69a082180fa9b4ed39274e43 Merge: 9ef8f5d1b 5f4e14b8c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 11:45:16 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/trove_2020_003 | 4 ++++ src/feature/hs/hs_client.c | 6 +++--- src/feature/hs/hs_service.c | 6 ++++++ src/lib/crypt_ops/crypto_ed25519.c | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 17 Mar '20

17 Mar '20

commit bbc80ea042a124a5935bd4264677180efdcb2da2 Merge: 855cd533e e15a621ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 11:45:16 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/trove_2020_003 | 4 ++++ src/feature/hs/hs_client.c | 6 +++--- src/feature/hs/hs_service.c | 6 ++++++ src/lib/crypt_ops/crypto_ed25519.c | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --cc src/feature/hs/hs_client.c index 222261e60,9d67f7127..af8cb0b41 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@@ -1870,9 -1296,9 +1870,9 @@@ hs_client_decode_descriptor(const char /* Parse descriptor */ ret = hs_desc_decode_descriptor(desc_str, subcredential, - client_auht_sk, desc); + client_auth_sk, desc); memwipe(subcredential, 0, sizeof(subcredential)); - if (ret < 0) { + if (ret != HS_DESC_DECODE_OK) { goto err; }

1 0

[tor/release-0.4.3] Split a wide line.
by nickm＠torproject.org 17 Mar '20

17 Mar '20

commit bc4c89eb2f47ba0774a05aea3798fbec31f9b920 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 11:53:01 2020 -0400 Split a wide line. --- src/test/test_hs_control.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/test_hs_control.c b/src/test/test_hs_control.c index 566cc21fe..9277711d2 100644 --- a/src/test/test_hs_control.c +++ b/src/test/test_hs_control.c @@ -661,8 +661,10 @@ test_hs_control_add_onion_with_bad_pubkey(void *arg) conn.current_cmd = tor_strdup("ADD_ONION"); } - args = tor_strdup("ED25519-V3:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA Port=9735,127.0.0.1 Flags=DiscardPK"); + args = tor_strdup("ED25519-V3:AAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "AAAAAAAAAAAAAAAAAAAAAAA" + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA " + "Port=9735,127.0.0.1 Flags=DiscardPK"); retval = handle_control_command(&conn, (uint32_t) strlen(args), args); tt_int_op(retval, OP_EQ, 0);

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by nickm＠torproject.org 17 Mar '20

17 Mar '20

commit 5644086635caa0b82f625dbf66bfa3c4a2e29f2f Merge: 86bbd6eca 5ff8757aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 11:48:45 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 src/test/test_hs_control.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 17 Mar '20

17 Mar '20

commit 6031aa45fa8cd3b7b5666ae5915b552db35c0734 Merge: 4f2257477 5f4e14b8c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 11:45:16 2020 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/trove_2020_003 | 4 ++++ src/feature/hs/hs_client.c | 6 +++--- src/feature/hs/hs_service.c | 6 ++++++ src/lib/crypt_ops/crypto_ed25519.c | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.5] Fix TROVE-2020-003.
by nickm＠torproject.org 17 Mar '20

17 Mar '20

commit 089e57d22f7c5e755a2d88d0b102207f7207ee27 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Feb 11 18:37:55 2020 +0200 Fix TROVE-2020-003. Given that ed25519 public key validity checks are usually not needed and (so far) they are only necessary for onion addesses in the Tor protocol, we decided to fix this specific bug instance without modifying the rest of the codebase (see below for other fix approaches). In our minimal fix we check that the pubkey in hs_service_add_ephemeral() is valid and error out otherwise. --- changes/trove_2020_003 | 4 ++++ src/feature/hs/hs_service.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/changes/trove_2020_003 b/changes/trove_2020_003 new file mode 100644 index 000000000..aa1a8f1c7 --- /dev/null +++ b/changes/trove_2020_003 @@ -0,0 +1,4 @@ + o Minor bugfixes (onion services v3): + - Fix assertion failure that could result from a corrupted ADD_ONION control + port command. Found by Saibato. Fixes bug 33137; bugfix on + 0.3.3.1-alpha. This issue is also being tracked as TROVE-2020-003. diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index 7e150599f..6d32cae86 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -3578,6 +3578,12 @@ hs_service_add_ephemeral(ed25519_secret_key_t *sk, smartlist_t *ports, goto err; } + if (ed25519_validate_pubkey(&service->keys.identity_pk) < 0) { + log_warn(LD_CONFIG, "Bad ed25519 private key was provided"); + ret = RSAE_BADPRIVKEY; + goto err; + } + /* Make sure we have at least one port. */ if (smartlist_len(service->config.ports) == 0) { log_warn(LD_CONFIG, "At least one VIRTPORT/TARGET must be specified "

1 0

[tor/release-0.4.3] Fix TROVE-2020-003.
by nickm＠torproject.org 17 Mar '20

17 Mar '20

commit 089e57d22f7c5e755a2d88d0b102207f7207ee27 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Feb 11 18:37:55 2020 +0200 Fix TROVE-2020-003. Given that ed25519 public key validity checks are usually not needed and (so far) they are only necessary for onion addesses in the Tor protocol, we decided to fix this specific bug instance without modifying the rest of the codebase (see below for other fix approaches). In our minimal fix we check that the pubkey in hs_service_add_ephemeral() is valid and error out otherwise. --- changes/trove_2020_003 | 4 ++++ src/feature/hs/hs_service.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/changes/trove_2020_003 b/changes/trove_2020_003 new file mode 100644 index 000000000..aa1a8f1c7 --- /dev/null +++ b/changes/trove_2020_003 @@ -0,0 +1,4 @@ + o Minor bugfixes (onion services v3): + - Fix assertion failure that could result from a corrupted ADD_ONION control + port command. Found by Saibato. Fixes bug 33137; bugfix on + 0.3.3.1-alpha. This issue is also being tracked as TROVE-2020-003. diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index 7e150599f..6d32cae86 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -3578,6 +3578,12 @@ hs_service_add_ephemeral(ed25519_secret_key_t *sk, smartlist_t *ports, goto err; } + if (ed25519_validate_pubkey(&service->keys.identity_pk) < 0) { + log_warn(LD_CONFIG, "Bad ed25519 private key was provided"); + ret = RSAE_BADPRIVKEY; + goto err; + } + /* Make sure we have at least one port. */ if (smartlist_len(service->config.ports) == 0) { log_warn(LD_CONFIG, "At least one VIRTPORT/TARGET must be specified "

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 17 Mar '20

17 Mar '20

commit e15a621ac81c472f69a082180fa9b4ed39274e43 Merge: 9ef8f5d1b 5f4e14b8c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 11:45:16 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/trove_2020_003 | 4 ++++ src/feature/hs/hs_client.c | 6 +++--- src/feature/hs/hs_service.c | 6 ++++++ src/lib/crypt_ops/crypto_ed25519.c | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 17 Mar '20

17 Mar '20

commit 5f4e14b8c8cd4c8907f669144a5a4bb8b8b7a585 Merge: c22696e36 089e57d22 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 11:45:16 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/trove_2020_003 | 4 ++++ src/feature/hs/hs_client.c | 6 +++--- src/feature/hs/hs_service.c | 6 ++++++ src/lib/crypt_ops/crypto_ed25519.c | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-)

1 0