mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: ssl: empty connections reported as errors.

Browse Source 
Empty connection is reported as handshake error
even if dont-log-null is specified.

This bug affect is a regression du to:

BUILD: ssl: fix to build (again) with boringssl

New openssl 1.1.1 defines OPENSSL_NO_HEARTBEATS as boring ssl
so the test was replaced by OPENSSL_IS_BORINGSSL

This fix should be backported on 1.8
This commit is contained in:
Emeric Brun 2018-08-16 11:36:40 +02:00 committed by Willy Tarreau
parent 042effdc81
commit 77e8919fc6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl_sock.c
View File

@ -5138,7 +5138,7 @@ int ssl_sock_handshake(struct connection *conn, unsigned int flag)
if (!errno && conn->flags & CO_FL_WAIT_L4_CONN) if (!errno && conn->flags & CO_FL_WAIT_L4_CONN)
conn->flags &= ~CO_FL_WAIT_L4_CONN; conn->flags &= ~CO_FL_WAIT_L4_CONN;
if (!conn->err_code) { if (!conn->err_code) {
#ifdef OPENSSL_NO_HEARTBEATS /* BoringSSL */ #ifdef OPENSSL_IS_BORINGSSL /* BoringSSL */
conn->err_code = CO_ER_SSL_HANDSHAKE; conn->err_code = CO_ER_SSL_HANDSHAKE;
#else #else
int empty_handshake; int empty_handshake;
@ -5222,7 +5222,7 @@ check_error:
if (!errno && conn->flags & CO_FL_WAIT_L4_CONN) if (!errno && conn->flags & CO_FL_WAIT_L4_CONN)
conn->flags &= ~CO_FL_WAIT_L4_CONN; conn->flags &= ~CO_FL_WAIT_L4_CONN;
if (!conn->err_code) { if (!conn->err_code) {
#ifdef OPENSSL_NO_HEARTBEATS /* BoringSSL */ #ifdef OPENSSL_IS_BORINGSSL /* BoringSSL */
conn->err_code = CO_ER_SSL_HANDSHAKE; conn->err_code = CO_ER_SSL_HANDSHAKE;
#else #else
int empty_handshake; int empty_handshake;