From: Willy Tarreau <w@1wt.eu>
Date: Fri, 8 Mar 2024 17:21:14 +0000 (+0100)
Subject: BUILD: ssl: define EVP_CTRL_AEAD_GET_TAG for older versions
X-Git-Tag: v3.0-dev5~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26cd248feb52f13dcbfa81611078a8b5b35c90c7;p=thirdparty%2Fhaproxy.git

BUILD: ssl: define EVP_CTRL_AEAD_GET_TAG for older versions

Amaury reported that previous commit 08ac282375 ("MINOR: Add aes_gcm_enc
converter") broke the CI on OpenSSL 1.0.2 due to the define above not
existing there. Let's just map it to its older name when not existing.
For reference, these were renamed when switching to 1.1.0:

    https://marc.info/?l=openssl-cvs&m=142244190907706&w=2

No backport is needed.
---

diff --git a/include/haproxy/openssl-compat.h b/include/haproxy/openssl-compat.h
index 01d4ec471a..48160e8326 100644
--- a/include/haproxy/openssl-compat.h
+++ b/include/haproxy/openssl-compat.h
@@ -381,6 +381,10 @@ static inline unsigned long ERR_peek_error_func(const char **func)
 #define EVP_CTRL_AEAD_SET_TAG   EVP_CTRL_GCM_SET_TAG
 #endif
 
+#if !defined(EVP_CTRL_AEAD_GET_TAG)
+#define EVP_CTRL_AEAD_GET_TAG EVP_CTRL_GCM_GET_TAG
+#endif
+
 /* Supported hash function for TLS tickets */
 #ifdef OPENSSL_NO_SHA256
 #define TLS_TICKET_HASH_FUNCT EVP_sha1