]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #6910 from pieterlexis/openssl-eddsa
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 4 Oct 2018 05:56:07 +0000 (07:56 +0200)
committerGitHub <noreply@github.com>
Thu, 4 Oct 2018 05:56:07 +0000 (07:56 +0200)
Add support for OpenSSL 1.1.1's ed25519 and ed448 for signing and verifying

1  2 
configure.ac
pdns/opensslsigners.cc
pdns/recursordist/configure.ac
pdns/test-signers.cc

diff --cc configure.ac
Simple merge
Simple merge
index 3b38e9fd505a4c3ef544e7647ed97e3d86a39fa7,e0384546806c22ed4bc735981099c35bc4c125d3..0e3904457bde1fb6df123ffa440102469b84c665
@@@ -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])]
Simple merge