Commit cbd37459 authored by Nick Mathewson's avatar Nick Mathewson 🦞
Browse files

Merge remote branch 'origin/maint-0.2.2'

parents 9cbe64db 2bd64f9e

changes/fix2204

0 → 100644
+7 −0
Original line number Diff line number Diff line 
  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.

src/common/tortls.c

+1 −1
Original line number Diff line number Diff line
@@ -1054,7 +1054,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);