Cleanup

diff --git a/pdns/dnssecinfra.cc b/pdns/dnssecinfra.cc
index e4ded6aea35dea9822ed00ce23e0bf40494891a4..63fb16fe8dd07311ba63baf76e173099a489f82c 100644 (file)
--- a/pdns/dnssecinfra.cc
+++ b/pdns/dnssecinfra.cc
@@ -168,6 +168,23 @@ std::unique_ptr<DNSCryptoKeyEngine> DNSCryptoKeyEngine::makeFromISCString(DNSKEY
   return dpk;
 }
 
+std::unique_ptr<DNSCryptoKeyEngine> DNSCryptoKeyEngine::makeFromPEMString(DNSKEYRecordContent& drc, const std::string& raw)
+{
+  for (const makers_t::value_type& maker : getMakers()) {
+    std::unique_ptr<DNSCryptoKeyEngine> ret = nullptr;
+
+    try {
+      ret = maker.second(maker.first);
+      ret->fromPEMString(drc, raw);
+      return ret;
+    }
+    catch (...) {
+    }
+  }
+
+  return nullptr;
+}
+
 std::string DNSCryptoKeyEngine::convertToISC() const
 {
   storvector_t storvector = this->convertToISCVector();
@@ -369,23 +386,6 @@ std::unique_ptr<DNSCryptoKeyEngine> DNSCryptoKeyEngine::makeFromPublicKeyString(
   return dpk;
 }
 
-std::unique_ptr<DNSCryptoKeyEngine> DNSCryptoKeyEngine::makeFromPEMString(DNSKEYRecordContent& drc, const std::string& raw)
-{
-  for (const makers_t::value_type& val : getMakers()) {
-    std::unique_ptr<DNSCryptoKeyEngine> ret = nullptr;
-
-    try {
-      ret = val.second(val.first);
-      ret->fromPEMString(drc, raw);
-      return ret;
-    }
-    catch (...) {
-    }
-  }
-
-  return nullptr;
-}
-
 /**
  * Returns the string that should be hashed to create/verify the RRSIG content
  *

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 1be8123e7daafd8be870f1c430a1d85b73cc0365..325b259ddf9bafc22230064261a475c85a785f22 100644 (file)
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -3286,9 +3286,10 @@ try
 
     string zone = cmds.at(1);
     string fname = cmds.at(2);
-    string line;
+
     ifstream ifs(fname.c_str());
-    string tmp, interim, raw;
+    string line;
+    string interim;
     while (getline(ifs, line)) {
       if (line[0] == '-') {
         continue;
@@ -3296,7 +3297,10 @@ try
       boost::trim(line);
       interim += line;
     }
+
+    string raw;
     B64Decode(interim, raw);
+
     DNSSECPrivateKey dpk;
     DNSKEYRecordContent drc;
     shared_ptr<DNSCryptoKeyEngine> key(DNSCryptoKeyEngine::makeFromPEMString(drc, raw));