From: Ilya Shipitsin Date: Sat, 6 Feb 2021 13:55:27 +0000 (+0500) Subject: BUILD: ssl: fix typo in HAVE_SSL_CTX_ADD_SERVER_CUSTOM_EXT macro X-Git-Tag: v2.4-dev8~105 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7bbf5866e011d22ee8f1d00471ce330cc72dcd0e;p=thirdparty%2Fhaproxy.git BUILD: ssl: fix typo in HAVE_SSL_CTX_ADD_SERVER_CUSTOM_EXT macro HAVE_SSL_CTX_ADD_SERVER_CUSTOM_EXT was introduced in ec609098718b9c1cd803ca57442b2b98c9ba4a16 however it was defined as HAVE_SL_CTX_ADD_SERVER_CUSTOM_EXT (missing "S") let us fix typo --- diff --git a/include/haproxy/openssl-compat.h b/include/haproxy/openssl-compat.h index b4af429cf0..3fe58be405 100644 --- a/include/haproxy/openssl-compat.h +++ b/include/haproxy/openssl-compat.h @@ -50,7 +50,7 @@ #endif #if ((OPENSSL_VERSION_NUMBER >= 0x1000200fL) && !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER) && !defined(OPENSSL_IS_BORINGSSL)) -#define HAVE_SL_CTX_ADD_SERVER_CUSTOM_EXT +#define HAVE_SSL_CTX_ADD_SERVER_CUSTOM_EXT #endif #if ((OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER)) diff --git a/src/ssl_sock.c b/src/ssl_sock.c index ccce578746..f2c8a667cd 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -1497,7 +1497,7 @@ static int ssl_sock_load_ocsp(SSL_CTX *ctx, const struct cert_key_and_chain *ckc #endif -#ifdef HAVE_SL_CTX_ADD_SERVER_CUSTOM_EXT +#ifdef HAVE_SSL_CTX_ADD_SERVER_CUSTOM_EXT #define CT_EXTENSION_TYPE 18 @@ -3217,7 +3217,7 @@ static int ssl_sock_put_ckch_into_ctx(const char *path, const struct cert_key_an } #endif -#ifdef HAVE_SL_CTX_ADD_SERVER_CUSTOM_EXT +#ifdef HAVE_SSL_CTX_ADD_SERVER_CUSTOM_EXT if (sctl_ex_index >= 0 && ckch->sctl) { if (ssl_sock_load_sctl(ctx, ckch->sctl) < 0) { memprintf(err, "%s '%s.sctl' is present but cannot be read or parsed'.\n",