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

[tor/master] Merge branch 'trove_2020_002_035' into trove_2020_002_041
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit dd6e2277e0d336f3d519f88d792b832d04e2c323 Merge: 1a375c3b1 29c9675bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 14 14:20:51 2020 -0400 Merge branch 'trove_2020_002_035' into trove_2020_002_041 src/lib/crypt_ops/crypto_rsa_openssl.c | 5 +++++ src/test/test_crypto.c | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+)

1 0

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

18 Mar '20

commit 85141a3a74efb0db29ff98667e83b06208d1c926 Merge: 4ee269941 57b1d0848 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 15:22:36 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/ticket33119 | 8 +++++ src/feature/dirparse/parsecommon.c | 9 ++++- src/lib/crypt_ops/crypto_rsa.c | 27 +++++++++++---- src/lib/crypt_ops/crypto_rsa.h | 5 ++- src/lib/crypt_ops/crypto_rsa_nss.c | 14 +++++++- src/lib/crypt_ops/crypto_rsa_openssl.c | 63 ++++++++++++++++++++++++++++++++-- src/test/test_crypto.c | 39 +++++++++++++++++++++ 7 files changed, 154 insertions(+), 11 deletions(-)

1 0

[tor/master] Use >= consistently with max_bits.
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit f958b537abc1285dd627c03f091dc94a5d17995a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 10:09:58 2020 -0400 Use >= consistently with max_bits. --- src/lib/crypt_ops/crypto_rsa_nss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/crypt_ops/crypto_rsa_nss.c b/src/lib/crypt_ops/crypto_rsa_nss.c index 4cf699067..7abf6716f 100644 --- a/src/lib/crypt_ops/crypto_rsa_nss.c +++ b/src/lib/crypt_ops/crypto_rsa_nss.c @@ -736,7 +736,7 @@ crypto_pk_asn1_decode_private(const char *str, size_t len, int max_bits) if (output) { const int bits = SECKEY_PublicKeyStrengthInBits(output->pubkey); - if (max_bits > 0 && bits > max_bits) { + if (max_bits >= 0 && bits > max_bits) { log_info(LD_CRYPTO, "Private key longer than expected."); crypto_pk_free(output); output = NULL;

1 0

[tor/master] Merge branch 'trove_2020_002_041' into maint-0.4.1
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit 3c8a4b8fbdb42b2fa98ddec8b6d7ed3202201eb1 Merge: cec647ff3 916378103 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 15:22:02 2020 -0400 Merge branch 'trove_2020_002_041' into maint-0.4.1 changes/ticket33119 | 8 +++++ src/feature/dirparse/parsecommon.c | 9 ++++- src/lib/crypt_ops/crypto_rsa.c | 27 +++++++++++---- src/lib/crypt_ops/crypto_rsa.h | 5 ++- src/lib/crypt_ops/crypto_rsa_nss.c | 14 +++++++- src/lib/crypt_ops/crypto_rsa_openssl.c | 63 ++++++++++++++++++++++++++++++++-- src/test/test_crypto.c | 39 +++++++++++++++++++++ 7 files changed, 154 insertions(+), 11 deletions(-)

1 0

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

18 Mar '20

commit 57b1d0848e9b42670d6f33e37a2095740726e2b1 Merge: 3c8a4b8fb fe3d8ec38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 15:22:36 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1

1 0

[tor/master] Add off-by-one checks for key length.
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit 2328c79a5fbc2f1995390dd08002244bc952246d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 10:07:54 2020 -0400 Add off-by-one checks for key length. --- src/test/test_crypto.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 2373e5bf8..5af0cce13 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1505,6 +1505,21 @@ test_crypto_pk_bad_size(void *arg) pk2 = crypto_pk_asn1_decode_private(buf, n, 1020); tt_assert(! pk2); + /* Set the max bit count one bit smaller: we should refuse to decode the + key.*/ + pk2 = crypto_pk_asn1_decode_private(buf, n, 1023); + tt_assert(! pk2); + + /* Correct size: should work. */ + pk2 = crypto_pk_asn1_decode_private(buf, n, 1024); + tt_assert(pk2); + crypto_pk_free(pk2); + + /* One bit larger: should work. */ + pk2 = crypto_pk_asn1_decode_private(buf, n, 1025); + tt_assert(pk2); + crypto_pk_free(pk2); + /* Set the max bit count larger: it should decode fine. */ pk2 = crypto_pk_asn1_decode_private(buf, n, 2048); tt_assert(pk2);

1 0

[tor/master] Merge branch 'trove_2020_002_035' into maint-0.3.5
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit fe3d8ec38e3c4c2a992280c2847cdd8e05f81d36 Merge: 089e57d22 f958b537a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 15:21:48 2020 -0400 Merge branch 'trove_2020_002_035' into maint-0.3.5 changes/ticket33119 | 8 +++++ src/feature/dirparse/parsecommon.c | 9 ++++- src/lib/crypt_ops/crypto_rsa.c | 27 +++++++++++---- src/lib/crypt_ops/crypto_rsa.h | 5 ++- src/lib/crypt_ops/crypto_rsa_nss.c | 14 +++++++- src/lib/crypt_ops/crypto_rsa_openssl.c | 63 ++++++++++++++++++++++++++++++++-- src/test/test_crypto.c | 39 +++++++++++++++++++++ 7 files changed, 154 insertions(+), 11 deletions(-)

1 0

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

18 Mar '20

commit e0d68ce84fe4536142d7f5e8987a08d9e93ac626 Merge: 6803373aa 85141a3a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 15:22:36 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/ticket33119 | 8 +++++ src/feature/dirparse/parsecommon.c | 9 ++++- src/lib/crypt_ops/crypto_rsa.c | 27 +++++++++++---- src/lib/crypt_ops/crypto_rsa.h | 5 ++- src/lib/crypt_ops/crypto_rsa_nss.c | 14 +++++++- src/lib/crypt_ops/crypto_rsa_openssl.c | 63 ++++++++++++++++++++++++++++++++-- src/test/test_crypto.c | 39 +++++++++++++++++++++ 7 files changed, 154 insertions(+), 11 deletions(-)

1 0

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

18 Mar '20

commit 758deaa472b879645828c1ee585eb6ce8b8a9a50 Merge: 85141a3a7 4ad3f17c2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 18 08:20:16 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 src/lib/crypt_ops/crypto_rsa_openssl.c | 7 +++++++ 1 file changed, 7 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit 7059c329682d70f1b2de4c774971745b0a917073 Merge: 3d8c97a98 84f57b69f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 18 08:20:38 2020 -0400 Merge branch 'maint-0.4.3' src/lib/crypt_ops/crypto_rsa_openssl.c | 7 +++++++ 1 file changed, 7 insertions(+)

1 0