October 2019 - tor-commits - lists.torproject.org

[tor/maint-0.4.1] Avoid a crash if our "current" and "old" ntor onion keys are equal
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 2da4d64a64a803f4b0a6d56e517b4288bef6c4f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 18 11:14:45 2019 -0400 Avoid a crash if our "current" and "old" ntor onion keys are equal Our dimap code asserts if you try to add the same key twice; this can't happen if everything is running smoothly, but it's possible if you try to start a relay where secret_onion_key_ntor is the same as secret_onion_key_ntor.old. Fixes bug 30916; bugfix on 0.2.4.8-alpha when ntor keys were introduced. --- changes/bug30916 | 4 ++++ src/feature/relay/router.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug30916 b/changes/bug30916 new file mode 100644 index 000000000..b006bfc75 --- /dev/null +++ b/changes/bug30916 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay): + - Avoid crashing when starting with a corrupt keys directory where + the old ntor key and the new ntor key are identical. Fixes bug 30916; + bugfix on 0.2.4.8-alpha. diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 88a30cef0..1dbaf2ed6 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -286,7 +286,8 @@ construct_ntor_key_map(void) tor_memdup(&curve25519_onion_key, sizeof(curve25519_keypair_t))); } - if (!tor_mem_is_zero((const char*)last_pk, CURVE25519_PUBKEY_LEN)) { + if (!tor_mem_is_zero((const char*)last_pk, CURVE25519_PUBKEY_LEN) && + tor_memneq(cur_pk, last_pk, CURVE25519_PUBKEY_LEN)) { dimap_add_entry(&m, last_pk, tor_memdup(&last_curve25519_onion_key, sizeof(curve25519_keypair_t)));

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit d08d29f15f0c80b74f6440b8b84eefe241c87aad Merge: b588b6087 4bbefc2aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 12:53:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1 changes/bug30916 | 4 ++++ src/feature/relay/router.c | 18 ++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit d08d29f15f0c80b74f6440b8b84eefe241c87aad Merge: b588b6087 4bbefc2aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 12:53:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1 changes/bug30916 | 4 ++++ src/feature/relay/router.c | 18 ++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-)

1 0

[tor/release-0.4.1] Extract expressions in construct_ntor_key_map()
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 1e9488f2fd829d48eb5ef6c2170e0f7163061136 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 18 11:11:05 2019 -0400 Extract expressions in construct_ntor_key_map() No behavioral change here: this is just refactoring. --- src/feature/relay/router.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index dad2c6a50..88a30cef0 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -278,19 +278,16 @@ construct_ntor_key_map(void) { di_digest256_map_t *m = NULL; - if (!tor_mem_is_zero((const char*) - curve25519_onion_key.pubkey.public_key, - CURVE25519_PUBKEY_LEN)) { - dimap_add_entry(&m, - curve25519_onion_key.pubkey.public_key, + const uint8_t *cur_pk = curve25519_onion_key.pubkey.public_key; + const uint8_t *last_pk = last_curve25519_onion_key.pubkey.public_key; + + if (!tor_mem_is_zero((const char *)cur_pk, CURVE25519_PUBKEY_LEN)) { + dimap_add_entry(&m, cur_pk, tor_memdup(&curve25519_onion_key, sizeof(curve25519_keypair_t))); } - if (!tor_mem_is_zero((const char*) - last_curve25519_onion_key.pubkey.public_key, - CURVE25519_PUBKEY_LEN)) { - dimap_add_entry(&m, - last_curve25519_onion_key.pubkey.public_key, + if (!tor_mem_is_zero((const char*)last_pk, CURVE25519_PUBKEY_LEN)) { + dimap_add_entry(&m, last_pk, tor_memdup(&last_curve25519_onion_key, sizeof(curve25519_keypair_t))); }

1 0

[tor/release-0.4.1] Merge branch 'bug30916_035' into bug30916_041
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 4bbefc2aac2d3770817200700e2a384d966bffe2 Merge: 70bcff601 2da4d64a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 18 11:19:41 2019 -0400 Merge branch 'bug30916_035' into bug30916_041 changes/bug30916 | 4 ++++ src/feature/relay/router.c | 18 ++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --cc src/feature/relay/router.c index 25bb1835c,1dbaf2ed6..e2ba51a5b --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@@ -284,19 -278,17 +284,17 @@@ construct_ntor_key_map(void { di_digest256_map_t *m = NULL; - if (!fast_mem_is_zero((const char*) - curve25519_onion_key.pubkey.public_key, - CURVE25519_PUBKEY_LEN)) { - dimap_add_entry(&m, - curve25519_onion_key.pubkey.public_key, + const uint8_t *cur_pk = curve25519_onion_key.pubkey.public_key; + const uint8_t *last_pk = last_curve25519_onion_key.pubkey.public_key; + - if (!tor_mem_is_zero((const char *)cur_pk, CURVE25519_PUBKEY_LEN)) { ++ if (!fast_mem_is_zero((const char *)cur_pk, CURVE25519_PUBKEY_LEN)) { + dimap_add_entry(&m, cur_pk, tor_memdup(&curve25519_onion_key, sizeof(curve25519_keypair_t))); } - if (!fast_mem_is_zero((const char*) - last_curve25519_onion_key.pubkey.public_key, - CURVE25519_PUBKEY_LEN)) { - dimap_add_entry(&m, - last_curve25519_onion_key.pubkey.public_key, - if (!tor_mem_is_zero((const char*)last_pk, CURVE25519_PUBKEY_LEN) && ++ if (!fast_mem_is_zero((const char*)last_pk, CURVE25519_PUBKEY_LEN) && + tor_memneq(cur_pk, last_pk, CURVE25519_PUBKEY_LEN)) { + dimap_add_entry(&m, last_pk, tor_memdup(&last_curve25519_onion_key, sizeof(curve25519_keypair_t))); }

1 0

[tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 5ddc04f49d1bcb9485de5a0eb500c6e03ac5fe7e Merge: 730f0e3da d08d29f15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 12:53:12 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 5ddc04f49d1bcb9485de5a0eb500c6e03ac5fe7e Merge: 730f0e3da d08d29f15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 12:53:12 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit fb610c9a23b37428c6211965f600a893b02cc395 Merge: 796f1d8b7 5ddc04f49 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 12:53:12 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 7664d6f518ea804e2bee942cfd15a8d4a9a724d3 Merge: e655744c8 d08d29f15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 12:53:12 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug30916 | 4 ++++ src/feature/relay/router.c | 18 ++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.2'
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 7c88fcf4e2ed04af07fed9438b59764f1b4adab0 Merge: 7d75e1dbd 5ddc04f49 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 12:53:12 2019 -0400 Merge branch 'maint-0.4.2'

1 0