nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Browse Source
This commit is contained in:
Nick Mathewson 2010-11-21 14:33:11 -05:00
commit 2bd64f9e8f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/fix2204 Normal file
View File

@ -0,0 +1,7 @@
o Major bugfixes
- Do not set the tlsext_host_name extension on server SSL objects;
only on client SSL objects. We set it to immitate a browser, not a
vhosting server. This resolves an incompatibility with openssl 0.9.8p
and openssl 1.0.0b. Fixes bug 2204; bugfix on 0.2.1.1-alpha.

2
src/common/tortls.c
View File

@ -1027,7 +1027,7 @@ tor_tls_new(int sock, int isServer)
#ifdef SSL_set_tlsext_host_name #ifdef SSL_set_tlsext_host_name
/* Browsers use the TLS hostname extension, so we should too. */ /* Browsers use the TLS hostname extension, so we should too. */
{ if (!isServer) {
char *fake_hostname = crypto_random_hostname(4,25, "www.",".com"); char *fake_hostname = crypto_random_hostname(4,25, "www.",".com");
SSL_set_tlsext_host_name(result->ssl, fake_hostname); SSL_set_tlsext_host_name(result->ssl, fake_hostname);
tor_free(fake_hostname); tor_free(fake_hostname);