From cc0169343b523064e0f2c85b4575a4a4367efbb9 Mon Sep 17 00:00:00 2001 From: Mark Schouten Date: Mon, 23 Jun 2014 10:10:54 +0200 Subject: [PATCH] Add dnskey and set the content to actual private data --- pdns/ws-auth.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc index 1359ba4e3b..70238530cb 100644 --- a/pdns/ws-auth.cc +++ b/pdns/ws-auth.cc @@ -511,8 +511,11 @@ static void apiZoneCryptokeys(HttpRequest* req, HttpResponse* resp) { key.AddMember("id", value.second.id, doc.GetAllocator()); key.AddMember("active", value.second.active, doc.GetAllocator()); key.AddMember("keytype", (value.second.keyOrZone ? "ksk" : "zsk"), doc.GetAllocator()); + Value dnskey(value.first.getDNSKEY().getZoneRepresentation().c_str(), doc.GetAllocator()); + key.AddMember("dnskey", dnskey, doc.GetAllocator()); if (req->path_parameters.count("key_id")) { - Value content(value.first.getDNSKEY().getZoneRepresentation().c_str(), doc.GetAllocator()); + DNSSECPrivateKey dpk=dk.getKeyById(zonename, lexical_cast(req->path_parameters["key_id"])); + Value content(dpk.getKey()->convertToISC().c_str(), doc.GetAllocator()); key.AddMember("content", content, doc.GetAllocator()); } -- 2.47.2