]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: ssl: guard openssl specific with SSL_READ_EARLY_DATA_SUCCESS
authorIlya Shipitsin <chipitsine@gmail.com>
Thu, 7 Jan 2021 06:59:58 +0000 (11:59 +0500)
committerWilliam Lallemand <wlallemand@haproxy.org>
Thu, 7 Jan 2021 09:20:04 +0000 (10:20 +0100)
let us switch to SSL_READ_EARLY_DATA_SUCCESS instead of openssl versions

src/ssl_sock.c

index 587140f1bbe8c6847d863564a59d4beffedc4b2a..5ac81d36ac4a703485427fac5b0bbaff18a9d24f 100644 (file)
@@ -5630,7 +5630,7 @@ static struct task *ssl_sock_io_cb(struct task *t, void *context, unsigned short
                        goto leave;
                }
        }
-#if (HA_OPENSSL_VERSION_NUMBER >= 0x10101000L)
+#ifdef SSL_READ_EARLY_DATA_SUCCESS
        /* If we have early data and somebody wants to receive, let them */
        else if (b_data(&ctx->early_buf) && ctx->subs &&
                 ctx->subs->events & SUB_RETRY_RECV) {
@@ -5669,7 +5669,7 @@ static size_t ssl_sock_to_buf(struct connection *conn, void *xprt_ctx, struct bu
        if (!ctx)
                goto out_error;
 
-#if (HA_OPENSSL_VERSION_NUMBER >= 0x10101000L)
+#ifdef SSL_READ_EARLY_DATA_SUCCESS
        if (b_data(&ctx->early_buf)) {
                try = b_contig_space(buf);
                if (try > b_data(&ctx->early_buf))