Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Core
Tor
Commits
9c389411
Commit
9c389411
authored
15 years ago
by
Nick Mathewson
Browse files
Options
Downloads
Patches
Plain Diff
Work around a memory leak in openssl 0.9.8g (and maybe others)
parent
b3991ea7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+3
-0
3 additions, 0 deletions
ChangeLog
src/common/tortls.c
+9
-0
9 additions, 0 deletions
src/common/tortls.c
with
12 additions
and
0 deletions
ChangeLog
+
3
−
0
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
...
...
This diff is collapsed.
Click to expand it.
src/common/tortls.c
+
9
−
0
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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment