From: Ilya Shipitsin Date: Thu, 7 Jan 2021 06:59:58 +0000 (+0500) Subject: BUILD: ssl: guard openssl specific with SSL_READ_EARLY_DATA_SUCCESS X-Git-Tag: v2.4-dev6~85 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=761d64c7aef22330ff34faee5a37850320774597;p=thirdparty%2Fhaproxy.git BUILD: ssl: guard openssl specific with SSL_READ_EARLY_DATA_SUCCESS let us switch to SSL_READ_EARLY_DATA_SUCCESS instead of openssl versions --- diff --git a/src/ssl_sock.c b/src/ssl_sock.c index 587140f1bb..5ac81d36ac 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -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))