Merge branch 'fix2204' into maint-0.2.1
This commit is contained in:
commit
a9d2148f53
|
@ -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.
|
||||
|
||||
|
|
@ -898,7 +898,7 @@ tor_tls_new(int sock, int isServer)
|
|||
|
||||
#ifdef SSL_set_tlsext_host_name
|
||||
/* Browsers use the TLS hostname extension, so we should too. */
|
||||
{
|
||||
if (!isServer) {
|
||||
char *fake_hostname = crypto_random_hostname(4,25, "www.",".com");
|
||||
SSL_set_tlsext_host_name(result->ssl, fake_hostname);
|
||||
tor_free(fake_hostname);
|
||||
|
|
Loading…
Reference in New Issue