nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.0' into maint-0.3.1

Browse Source
This commit is contained in:
Nick Mathewson 2017-07-14 09:06:44 -04:00
commit bbc75faed1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug22803 Normal file
View File

@ -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.

4
src/test/test_link_handshake.c
View File

@ -234,6 +234,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);
@ -297,7 +298,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));