Move detection of SSL_CTX_set1_curves_list to autoconf (CHECK_SSL_CTX_SET1_CURVES_LIST)

diff --git a/autoconf/m4/unreal.m4 b/autoconf/m4/unreal.m4
index e3eac1b52b3a0eee739a5506616cad68ec91ca54..5263d7899b10b05799feffc2e93cdd02e2073031 100644 (file)
--- a/autoconf/m4/unreal.m4
+++ b/autoconf/m4/unreal.m4
@@ -181,3 +181,23 @@ AS_IF([test $enable_ssl != "no"],
        fi
        ])
 ])
+
+AC_DEFUN([CHECK_SSL_CTX_SET1_CURVES_LIST],
+[
+AC_MSG_CHECKING([for SSL_CTX_set1_curves_list in SSL library])
+AC_LANG_PUSH(C)
+SAVE_LIBS="$LIBS"
+LIBS="$LIBS $CRYPTOLIB"
+AC_TRY_LINK([#include <openssl/ssl.h>],
+       [SSL_CTX *ctx = NULL; SSL_CTX_set1_curves_list(ctx, "test");],
+       has_curves=1,
+       has_curves=0)
+LIBS="$SAVE_LIBS"
+AC_LANG_POP(C)
+if test $has_curves = 1; then
+       AC_MSG_RESULT([yes])
+       AC_DEFINE([HAS_SSL_CTX_SET1_CURVES_LIST], [], [Define if ssl library has SSL_CTX_set1_curves_list])
+else
+       AC_MSG_RESULT([no])
+fi
+])

diff --git a/configure b/configure
index b6608d5530085e392fd67392c57f3d1ea498a7b2..b61cc23c343b7e551dcfed2927144c860b732e71 100755 (executable)
--- a/configure
+++ b/configure
@@ -7306,6 +7306,53 @@ $as_echo "not found" >&6; }
 
 fi
 
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set1_curves_list in SSL library" >&5
+$as_echo_n "checking for SSL_CTX_set1_curves_list in SSL library... " >&6; }
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+SAVE_LIBS="$LIBS"
+LIBS="$LIBS $CRYPTOLIB"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <openssl/ssl.h>
+int
+main ()
+{
+SSL_CTX *ctx = NULL; SSL_CTX_set1_curves_list(ctx, "test");
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  has_curves=1
+else
+  has_curves=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS="$SAVE_LIBS"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+if test $has_curves = 1; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAS_SSL_CTX_SET1_CURVES_LIST /**/" >>confdefs.h
+
+else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
 # Check whether --enable-dynamic-linking was given.
 if test "${enable_dynamic_linking+set}" = set; then :
   enableval=$enable_dynamic_linking; enable_dynamic_linking=$enableval

diff --git a/configure.ac b/configure.ac
index 88eef6ac11ad1964f0f577a0eb1dd2e90516dfc8..f847e9777a3ca8f17824f7225c2f5a34a5c1c2f1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -692,6 +692,7 @@ AC_ARG_WITH(system-tre, [AS_HELP_STRING([--with-system-tre], [Use the system tre
 AC_ARG_WITH(system-pcre2, [AS_HELP_STRING([--with-system-pcre2], [Use the system pcre2 package instead of bundled, discovered using pkg-config])], [], [with_system_pcre2=no])
 AC_ARG_WITH(system-cares, [AS_HELP_STRING([--without-system-cares], [Use bundled version instead of system c-ares. Normally autodetected via pkg-config.])], [], [with_system_cares=yes])
 CHECK_SSL
+CHECK_SSL_CTX_SET1_CURVES_LIST
 AC_ARG_ENABLE(dynamic-linking, [AS_HELP_STRING([--disable-dynamic-linking], [Make the IRCd statically link with shared objects rather than dynamically (noone knows if disabling dynamic linking actually does anything or not)])],
        [enable_dynamic_linking=$enableval], [enable_dynamic_linking="yes"])
 AS_IF([test $enable_dynamic_linking = "yes"],

diff --git a/include/setup.h.in b/include/setup.h.in
index fc98b207641d3c89b5b29f6867be59fce9306770..f3e5401cd7a7f3c4a563fa82c9716ec285005776 100644 (file)
--- a/include/setup.h.in
+++ b/include/setup.h.in
@@ -43,6 +43,9 @@
 /* Define if you have strcasecmp */
 #undef GOT_STRCASECMP
 
+/* Define if ssl library has SSL_CTX_set1_curves_list */
+#undef HAS_SSL_CTX_SET1_CURVES_LIST
+
 /* Define to 1 if you have the `bcmp' function. */
 #undef HAVE_BCMP
 

diff --git a/src/s_conf.c b/src/s_conf.c
index b21ee01b7cc29463e4e476e53a981706753af2f5..160250b8e88600e56dac1ceead9031526ce6b95a 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -7039,7 +7039,7 @@ void test_sslblock(ConfigFile *conf, ConfigEntry *cep, int *totalerrors)
                else if (!strcmp(cepp->ce_varname, "ecdh-curves"))
                {
                        CheckNull(cepp);
-#if OPENSSL_VERSION_NUMBER < 0x10002000L
+#ifndef HAS_SSL_CTX_SET1_CURVES_LIST
                        config_error("ecdh-curves specified but your OpenSSL/LibreSSL library does not "
                                     "support setting curves manually by name. Either upgrade to a "
                                     "newer library version or remove the 'ecdh-curves' directive "

diff --git a/src/ssl.c b/src/ssl.c
index 0b83d9b0b1739d5ae3584b2cd70eb215363e7e2f..85e7be898140749e3e05eb62edd24513cfa50391 100644 (file)
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -386,7 +386,7 @@ SSL_CTX *init_ctx(SSLOptions *ssloptions, int server)
        {
                if (ssloptions->ecdh_curves)
                {
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#ifdef HAS_SSL_CTX_SET1_CURVES_LIST
                        if (!SSL_CTX_set1_curves_list(ctx, ssloptions->ecdh_curves))
                        {
                                config_warn("Failed to set ecdh-curves '%s'. "