Merge pull request #7516 from Habbie/fromiscfile-errors

report checkKey errors upwards in makeFromISCFile exception
PowerDNS · Mar 5, 2019 · b0f70f2 · b0f70f2
2 parents 9fa4d40 + be135ee
commit b0f70f2
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/pdns/dnssecinfra.cc b/pdns/dnssecinfra.cc
@@ -63,8 +63,14 @@ shared_ptr<DNSCryptoKeyEngine> DNSCryptoKeyEngine::makeFromISCFile(DNSKEYRecordC
   fp.reset();
 
   shared_ptr<DNSCryptoKeyEngine> dke = makeFromISCString(drc, isc);
-  if(!dke->checkKey()) {
-    throw runtime_error("Invalid DNS Private Key in file '"+string(fname));
+  vector<string> checkKeyErrors;
+
+  if(!dke->checkKey(&checkKeyErrors)) {
+    string reason;
+    if(checkKeyErrors.size()) {
+      reason = " ("+boost::algorithm::join(checkKeyErrors, ", ")+")";
+    }
+    throw runtime_error("Invalid DNS Private Key in file '"+string(fname)+"'"+reason);
   }
   return dke;
 }