From: Pieter Lexis <pieterlexis@users.noreply.github.com>
Date: Thu, 4 Oct 2018 05:56:07 +0000 (+0200)
Subject: Merge pull request #6910 from pieterlexis/openssl-eddsa
X-Git-Tag: dnsdist-1.3.3~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76849a090a5d4a370c566968fbc6df226d96394b;p=thirdparty%2Fpdns.git

Merge pull request #6910 from pieterlexis/openssl-eddsa

Add support for OpenSSL 1.1.1's ed25519 and ed448 for signing and verifying
---

76849a090a5d4a370c566968fbc6df226d96394b
diff --cc pdns/recursordist/configure.ac
index 3b38e9fd50,e038454680..0e3904457b
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@@ -223,14 -225,18 +224,14 @@@ 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])],
 -  [AC_MSG_NOTICE([Botan gost: no])]
 -)
  AS_IF([test "x$PROTOBUF_LIBS" != "x" -a x"$PROTOC" != "x"],
    [AC_MSG_NOTICE([Protobuf: yes])],
    [AC_MSG_NOTICE([Protobuf: no])]