Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Core
Tor
Commits
9c389411
Commit
9c389411
authored
Sep 17, 2009
by
Nick Mathewson
🐛
Browse files
Work around a memory leak in openssl 0.9.8g (and maybe others)
parent
b3991ea7
Changes
2
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
9c389411
...
...
@@ -45,6 +45,9 @@ Changes in version 0.2.1.20 - 2009-??-??
- Avoid segfault in rare cases when finishing an introduction circuit
as a client and finding out that we don't have an introduction key
for it. Fixes bug 1073. Reported by Aaron Swartz.
- Work around a small memory leak in some versions of OpenSSL that
stopped the memory used by the hostname TLS extension from being
freed.
o Minor features:
- Add a "getinfo status/accepted-server-descriptor" controller
...
...
src/common/tortls.c
View file @
9c389411
...
...
@@ -829,6 +829,9 @@ tor_tls_new(int sock, int isServer)
if
(
!
SSL_set_cipher_list
(
result
->
ssl
,
isServer
?
SERVER_CIPHER_LIST
:
CLIENT_CIPHER_LIST
))
{
tls_log_errors
(
NULL
,
LOG_WARN
,
"setting ciphers"
);
#ifdef SSL_set_tlsext_host_name
SSL_set_tlsext_host_name
(
result
->
ssl
,
NULL
);
#endif
SSL_free
(
result
->
ssl
);
tor_free
(
result
);
return
NULL
;
...
...
@@ -839,6 +842,9 @@ tor_tls_new(int sock, int isServer)
bio
=
BIO_new_socket
(
sock
,
BIO_NOCLOSE
);
if
(
!
bio
)
{
tls_log_errors
(
NULL
,
LOG_WARN
,
"opening BIO"
);
#ifdef SSL_set_tlsext_host_name
SSL_set_tlsext_host_name
(
result
->
ssl
,
NULL
);
#endif
SSL_free
(
result
->
ssl
);
tor_free
(
result
);
return
NULL
;
...
...
@@ -919,6 +925,9 @@ tor_tls_free(tor_tls_t *tls)
if
(
!
removed
)
{
log_warn
(
LD_BUG
,
"Freeing a TLS that was not in the ssl->tls map."
);
}
#ifdef SSL_set_tlsext_host_name
SSL_set_tlsext_host_name
(
tls
->
ssl
,
NULL
);
#endif
SSL_free
(
tls
->
ssl
);
tls
->
ssl
=
NULL
;
tls
->
negotiated_callback
=
NULL
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment