From: Remi Tricot-Le Breton <rlebreton@haproxy.com>
Date: Fri, 11 Feb 2022 11:04:45 +0000 (+0100)
Subject: MINOR: ssl: Remove call to ERR_load_SSL_strings with OpenSSLv3
X-Git-Tag: v2.6-dev2~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78a36e33443be166b1ae08d0a01c9ec4b79876a7;p=thirdparty%2Fhaproxy.git

MINOR: ssl: Remove call to ERR_load_SSL_strings with OpenSSLv3

Starting from OpenSSLv3, error strings are loaded automatically so
ERR_load_SSL_strings is not needed anymore and was marked as deprecated.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index f03a314e97..b360f714bc 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -7786,8 +7786,10 @@ static void __ssl_sock_init(void)
 #ifndef OPENSSL_NO_ENGINE
 	hap_register_post_deinit(ssl_free_engines);
 #endif
+#if HA_OPENSSL_VERSION_NUMBER < 0x3000000fL
 	/* Load SSL string for the verbose & debug mode. */
 	ERR_load_SSL_strings();
+#endif
 	ha_meth = BIO_meth_new(0x666, "ha methods");
 	BIO_meth_set_write(ha_meth, ha_ssl_write);
 	BIO_meth_set_read(ha_meth, ha_ssl_read);