haproxy: update to 1.8.14.

This commit is contained in:
Matej Gera 2018-10-22 08:32:45 +02:00 committed by maxice8
parent 949b688ebf
commit 44f5970a0e

View file

@ -102,3 +102,23 @@ index c2b5bf6..ebde76d 100644
if (!SSL_is_init_finished(conn->xprt_ctx)) {
unsigned int max_early;
--- src/ssl_sock.c 2018-10-21 20:57:07.520516300 +0200
+++ - 2018-10-21 21:08:48.989272557 +0200
@@ -5133,7 +5133,7 @@
OSSL_HANDSHAKE_STATE state = SSL_get_state((SSL *)conn->xprt_ctx);
empty_handshake = state == TLS_ST_BEFORE;
#else
- empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length;
+ empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE;
#endif
if (empty_handshake) {
if (!errno) {
@@ -5217,7 +5217,7 @@
OSSL_HANDSHAKE_STATE state = SSL_get_state((SSL *)conn->xprt_ctx);
empty_handshake = state == TLS_ST_BEFORE;
#else
- empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length;
+ empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE;
#endif
if (empty_handshake) {
if (!errno) {