]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: ssl: fix libressl build again after aes-gcm-enc
authorWilly Tarreau <w@1wt.eu>
Fri, 10 May 2019 07:16:53 +0000 (09:16 +0200)
committerWilly Tarreau <w@1wt.eu>
Fri, 10 May 2019 07:19:07 +0000 (09:19 +0200)
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.

src/ssl_sock.c

index e3e938d9395869222bb9f60da8f3fe60e5494af4..506be4eb1fdcc1202df2182a6f37ee19d13b7672 100644 (file)
@@ -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