commit 5b1342bb838c7e092418aaed610486ac7770e8c0
author Lukas Tribus <lukas@ltri.eu> Fri Dec 20 18:47:18 2019 +0100
committer Willy Tarreau <w@1wt.eu> Sat Dec 21 12:02:52 2019 +0100
tree 8e724d19edaa21d77a481c2f5f4b20213578fd00
parent 0ed1e896398c18b294507d384670f41fb2676fe7

BUILD: ssl: improve SSL_CTX_set_ecdh_auto compatibility

SSL_CTX_set_ecdh_auto() is not defined when OpenSSL 1.1.1 is compiled
with the no-deprecated option. Remove existing, incomplete guards and
add a compatibility macro in openssl-compat.h, just as OpenSSL does:

https://github.com/openssl/openssl/blob/bf4006a6f9be691ba6eef0e8629e63369a033ccf/include/openssl/ssl.h#L1486

This should be backported as far as 2.0 and probably even 1.9.

(cherry picked from commit a26d1e13245a760bd422e4e4b6a85cc17f9f0a60)
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from commit adb6019d31a0632a4d322ac652a53deddc90a420)
Signed-off-by: Willy Tarreau <w@1wt.eu>

include/common/openssl-compat.h

diff --git a/include/common/openssl-compat.h b/include/common/openssl-compat.h
index bf6a97e..aeb8389 100644
--- a/include/common/openssl-compat.h
+++ b/include/common/openssl-compat.h
@@ -313,5 +313,9 @@
 #define BIO_meth_set_destroy(m, f) do { (m)->destroy = (f); } while (0)
 #endif
 
+#ifndef SSL_CTX_set_ecdh_auto
+#define SSL_CTX_set_ecdh_auto(dummy, onoff)      ((onoff) != 0)
+#endif
+
 #endif /* USE_OPENSSL */
 #endif /* _COMMON_OPENSSL_COMPAT_H */