From: Willy Tarreau <w@1wt.eu>
Date: Fri, 10 May 2019 07:16:53 +0000 (+0200)
Subject: BUILD: ssl: fix libressl build again after aes-gcm-enc
X-Git-Tag: v2.0-dev3~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df17e0e1a7908bdf665da4423b5f26d722e02eed;p=thirdparty%2Fhaproxy.git

BUILD: ssl: fix libressl build again after aes-gcm-enc

Enabling aes-gcm-enc in last commit (MINOR: ssl: enable aes_gcm_dec
on LibreSSL) uncovered a wrong condition on the define of the
EVP_CTRL_AEAD_SET_IVLEN macro which I forgot to add when making the
commit, resulting in breaking libressl build again. In case libressl
later defines this macro, the test will have to change for a version
range instead.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index e3e938d939..506be4eb1f 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -72,7 +72,7 @@
 #define X509_getm_notAfter      X509_get_notAfter
 #endif
 
-#if (OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL || defined LIBRESSL_VERSION_NUMBER)
 #define EVP_CTRL_AEAD_SET_IVLEN EVP_CTRL_GCM_SET_IVLEN
 #define EVP_CTRL_AEAD_SET_TAG   EVP_CTRL_GCM_SET_TAG
 #endif