Merge pull request #53842 from ajs124/powerdns_ecda

powerdns: fix ecdsa support

pkgs/servers/dns/powerdns/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig
-, boost, libyamlcpp, libsodium, sqlite, protobuf, botan2
+, boost, libyamlcpp, libsodium, sqlite, protobuf, botan2, libressl
 , mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC
 }:
 
@@ -15,12 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip
-    libyamlcpp libsodium curl opendbx unixODBC botan2
+    libyamlcpp libsodium curl opendbx unixODBC botan2 libressl
-  ];
-
-  patches = [
-    # checksum type not found, maybe a dependency is to old?
-    ./skip-sha384-test.patch
   ];
 
   # nix destroy with-modules arguments, when using configureFlags
@@ -29,6 +24,7 @@ stdenv.mkDerivation rec {
       "--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote"
       --with-sqlite3
       --with-socketdir=/var/lib/powerdns
+      --with-libcrypto=${libressl.dev}
       --enable-libsodium
       --enable-botan
       --enable-tools

pkgs/servers/dns/powerdns/skip-sha384-test.patch

@@ -1,14 +0,0 @@
---- pdns-4.1.1.org/pdns/test-signers.cc	2018-02-17 11:43:15.953228279 +0000
-+++ pdns-4.1.1/pdns/test-signers.cc	2018-02-17 11:44:21.089516393 +0000
-@@ -212,11 +212,6 @@
-       BOOST_CHECK_EQUAL(ds2.getZoneRepresentation(), signer.dsSHA256);
-     }
- 
--    auto ds4 = makeDSFromDNSKey(name, drc, DNSSECKeeper::SHA384);
--    if (!signer.dsSHA384.empty()) {
--      BOOST_CHECK_EQUAL(ds4.getZoneRepresentation(), signer.dsSHA384);
--    }
--
-     auto signature = dcke->sign(message);
-     BOOST_CHECK(dcke->verify(message, signature));
-