July 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit f5d2f79acafc0cb7698442aec3323b2abe802e37 Merge: c1afbbe 3a7d757 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:11:14 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22916_027 | 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.0] Merge branch 'bug22916_027' into maint-0.2.9
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit 3a7d757140c344986fba5769b47dc10d925fe119 Merge: ed0fb21 3cec178 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:11:08 2017 -0400 Merge branch 'bug22916_027' into maint-0.2.9 changes/bug22916_027 | 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit c90ea4ee18a8acf71832d464d720e9b9e96a866a Merge: ce2f38f f5d2f79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:11:14 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug22916_027 | 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.0] Merge branch 'bug22803_030' into maint-0.3.0
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit c1afbbe8feff1b803f721079b59a00438676045e Merge: 66c85cd 759154b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:06:33 2017 -0400 Merge branch 'bug22803_030' into maint-0.3.0 changes/bug22803 | 3 +++ src/test/test_link_handshake.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit ce2f38f05449b847799e4f9982ad3507d9a56e37 Merge: 72f06fc c1afbbe Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:06:44 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug22803 | 3 +++ src/test/test_link_handshake.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'bug22803_030' into maint-0.3.0
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit c1afbbe8feff1b803f721079b59a00438676045e Merge: 66c85cd 759154b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:06:33 2017 -0400 Merge branch 'bug22803_030' into maint-0.3.0 changes/bug22803 | 3 +++ src/test/test_link_handshake.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Merge branch 'bug22803_030' into maint-0.3.0
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit c1afbbe8feff1b803f721079b59a00438676045e Merge: 66c85cd 759154b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:06:33 2017 -0400 Merge branch 'bug22803_030' into maint-0.3.0 changes/bug22803 | 3 +++ src/test/test_link_handshake.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit bbc75faed1f7b73104ee706fc469249ad8f3d15c Merge: 66258f8 c1afbbe Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:06:44 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22803 | 3 +++ src/test/test_link_handshake.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Merge branch 'bug22803_030' into maint-0.3.0
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit c1afbbe8feff1b803f721079b59a00438676045e Merge: 66c85cd 759154b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 14 09:06:33 2017 -0400 Merge branch 'bug22803_030' into maint-0.3.0 changes/bug22803 | 3 +++ src/test/test_link_handshake.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Fix unit test memory leak in certs_ok_ed25519.
by nickm＠torproject.org 14 Jul '17

14 Jul '17

commit 759154b1ad8b2b5fabf09cb1dde93177c65d05a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 15:42:25 2017 -0400 Fix unit test memory leak in certs_ok_ed25519. Fixes bug 22803; bugfix on 0.3.0.1-alpha. --- changes/bug22803 | 3 +++ src/test/test_link_handshake.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug22803 b/changes/bug22803 new file mode 100644 index 0000000..80b4b9f --- /dev/null +++ b/changes/bug22803 @@ -0,0 +1,3 @@ + o Minor bugfixes (unit tests): + - Fix a memory leak in the link-handshake/certs_ok_ed25519 test. + Fixes bug 22803; bugfix on 0.3.0.1-alpha. diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c index d81f9e8..467bba3 100644 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@ -241,6 +241,7 @@ test_link_handshake_certs_ok(void *arg) } channel_tls_process_certs_cell(cell2, chan1); mock_peer_cert_expect_tortls = NULL; + tor_x509_cert_free(mock_peer_cert); mock_peer_cert = NULL; tor_assert(c1->handshake_state->authenticated); @@ -304,7 +305,8 @@ test_link_handshake_certs_ok(void *arg) UNMOCK(tor_tls_get_peer_cert); UNMOCK(tor_tls_get_own_cert); tor_x509_cert_free(mock_own_cert); - mock_own_cert = NULL; + tor_x509_cert_free(mock_peer_cert); + mock_own_cert = mock_peer_cert = NULL; memset(c1->identity_digest, 0, sizeof(c1->identity_digest)); memset(c2->identity_digest, 0, sizeof(c2->identity_digest)); connection_free_(TO_CONN(c1));

1 0