Commit 62f8e392 authored by Nick Mathewson's avatar Nick Mathewson 🦞
Browse files

Merge remote-tracking branch 'public/bug4591'

parents 0b1a3348 f0212197

changes/bug4591

0 → 100644
+6 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - If the client fails to set a reasonable set of ciphersuites

      during its v2 handshake renegotiation, allow the renegotiation

      to continue nevertheless (i.e., send all the required

      certificates). Fix for bug 4591; bugfix on 0.2.0.20-rc.

src/common/tortls.c

+3 −1
Original line number Diff line number Diff line
@@ -1370,7 +1370,9 @@ tor_tls_server_info_callback(const SSL *ssl, int type, int val) 


  /* Now check the cipher list. */

  if (tor_tls_client_is_using_v2_ciphers(ssl, ADDR(tls))) {

    /*XXXX_TLS keep this from happening more than once! */

    if (tls->wasV2Handshake)

      return; /* We already turned this stuff off for the first handshake;

               * This is a renegotiation. */



    /* Yes, we're casting away the const from ssl.  This is very naughty of us.

     * Let's hope openssl doesn't notice! */