BUG/MEDIUM: ssl: fix build with AWS-LC

AWS-LC doesn't provide SSL_in_before(), and doesn't provide an easy way
to know if we already started the handshake or not. So instead, just add
a new field in ssl_sock_ctx, "can_write_early_data", that will be
initialized to 1, and will be set to 0 as soon as we start the
handshake.

This should be backported up to 2.8 with
13aa5616c9f99dbca0711fd18f716bd6f48eb2ae.

diff --git a/include/haproxy/ssl_sock-t.h b/include/haproxy/ssl_sock-t.h
index 75d7eee19470967e7409d2c7b9e11c249c906fe6..a775b03e3d3580639a507e04f55f915b61094ba0 100644 (file)
--- a/include/haproxy/ssl_sock-t.h
+++ b/include/haproxy/ssl_sock-t.h
@@ -258,6 +258,7 @@ struct ssl_sock_ctx {
        unsigned long error_code;     /* last error code of the error stack */
        struct buffer early_buf;      /* buffer to store the early data received */
        int sent_early_data;          /* Amount of early data we sent so far */
        unsigned long error_code;     /* last error code of the error stack */
        struct buffer early_buf;      /* buffer to store the early data received */
        int sent_early_data;          /* Amount of early data we sent so far */

+       int can_send_early_data;      /* We did not start the handshake yet so we can send early data */

 
 #ifdef USE_QUIC
        struct quic_conn *qc;
 
 #ifdef USE_QUIC
        struct quic_conn *qc;

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 201f28602a1683e0efa9ae77233a769fab579c39..1fad578c8fd1e16a39e29d126eef26257d148b65 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -5104,6 +5104,7 @@ static int ssl_sock_init(struct connection *conn, void **xprt_ctx)
        ctx->xprt_st = 0;
        ctx->xprt_ctx = NULL;
        ctx->error_code = 0;
        ctx->xprt_st = 0;
        ctx->xprt_ctx = NULL;
        ctx->error_code = 0;

+       ctx->can_send_early_data = 1;

 
        next_sslconn = increment_sslconn();
        if (!next_sslconn) {
 
        next_sslconn = increment_sslconn();
        if (!next_sslconn) {


@@ -5458,6 +5459,7 @@ static int ssl_sock_handshake(struct connection *conn, unsigned int flag)
                /* read some data: consider handshake completed */
                goto reneg_ok;
        }
                /* read some data: consider handshake completed */
                goto reneg_ok;
        }

+       ctx->can_send_early_data = 0;

        ret = SSL_do_handshake(ctx->ssl);
 check_error:
        if (ret != 1) {
        ret = SSL_do_handshake(ctx->ssl);
 check_error:
        if (ret != 1) {


@@ -5929,10 +5931,10 @@ static size_t ssl_sock_to_buf(struct connection *conn, void *xprt_ctx, struct bu
 #endif
 
        /*
 #endif
 
        /*

-        * We have to check SSL_in_before() here, as the handshake flags
+        * We have to check can_send_early_data here, as the handshake flags

         * may have been removed in case we want to try to send early data.
         */
         * may have been removed in case we want to try to send early data.
         */

-       if (SSL_in_before(ctx->ssl) ||
+       if (ctx->can_send_early_data ||

            (conn->flags & (CO_FL_WAIT_XPRT | CO_FL_SSL_WAIT_HS))) {
                /* a handshake was requested */
                TRACE_LEAVE(SSL_EV_CONN_RECV, conn);
            (conn->flags & (CO_FL_WAIT_XPRT | CO_FL_SSL_WAIT_HS))) {
                /* a handshake was requested */
                TRACE_LEAVE(SSL_EV_CONN_RECV, conn);


@@ -6106,7 +6108,7 @@ static size_t ssl_sock_from_buf(struct connection *conn, void *xprt_ctx, const s
                        ctx->xprt_st &= ~SSL_SOCK_SEND_MORE;
 
 #ifdef SSL_READ_EARLY_DATA_SUCCESS
                        ctx->xprt_st &= ~SSL_SOCK_SEND_MORE;
 
 #ifdef SSL_READ_EARLY_DATA_SUCCESS

-               if (SSL_in_before(ctx->ssl) && conn_is_back(conn)) {
+               if (ctx->can_send_early_data && conn_is_back(conn)) {

                        unsigned int max_early;
 
                        if (objt_listener(conn->target))
                        unsigned int max_early;
 
                        if (objt_listener(conn->target))