Hook up OpenSSL EdDSA to recursor

diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index adbb49cbbb71b4391561e573697f2fdbaa1df0d3..e0384546806c22ed4bc735981099c35bc4c125d3 100644 (file)
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -118,6 +118,7 @@ PDNS_CHECK_LIBCRYPTO([
   ]
 )
 PDNS_CHECK_LIBCRYPTO_ECDSA
+PDNS_CHECK_LIBCRYPTO_EDDSA
 PDNS_CHECK_LIBSODIUM
 PDNS_CHECK_LIBDECAF
 
@@ -224,13 +225,13 @@ AC_MSG_NOTICE([Features enabled])
 AC_MSG_NOTICE([----------------])
 AC_MSG_NOTICE([Lua: $LUAPC])
 AC_MSG_NOTICE([OpenSSL ECDSA: $libcrypto_ecdsa])
-AS_IF([test "x$LIBSODIUM_LIBS" != "x"],
-  [AC_MSG_NOTICE([libsodium ed25519: yes])],
-  [AC_MSG_NOTICE([libsodium ed25519: no])]
+AS_IF([test "x$LIBSODIUM_LIBS" != "x" || test "x$LIBDECAF_LIBS" != "x" || test "x$libcrypto_ed25519" = "xyes"],
+  [AC_MSG_NOTICE([ed25519: yes])],
+  [AC_MSG_NOTICE([ed25519: no])]
 )
-AS_IF([test "x$LIBDECAF_LIBS" != "x"],
-  [AC_MSG_NOTICE([libdecaf ed25519 and ed448: yes])],
-  [AC_MSG_NOTICE([libdecaf ed25519 and ed448: no])]
+AS_IF([test "x$LIBDECAF_LIBS" != "x" || test "x$libcrypto_ed448" = "xyes"],
+  [AC_MSG_NOTICE([ed448: yes])],
+  [AC_MSG_NOTICE([ed448: no])]
 )
 AS_IF([test "x$BOTAN_LIBS" != "x"],
   [AC_MSG_NOTICE([Botan gost: yes])],

diff --git a/pdns/recursordist/m4/pdns_check_libcrypto_eddsa.m4 b/pdns/recursordist/m4/pdns_check_libcrypto_eddsa.m4
new file mode 120000 (symlink)
index 0000000..f0606fd
--- /dev/null
+++ b/pdns/recursordist/m4/pdns_check_libcrypto_eddsa.m4
@@ -0,0 +1 @@
+../../../m4/pdns_check_libcrypto_eddsa.m4
\ No newline at end of file