From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Mon, 21 Feb 2022 09:44:21 +0000 (+0100)
Subject: Cleanup
X-Git-Tag: rec-4.7.0-beta1~51^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06cb69074de00a2e6aa81ee6f81582cab838f892;p=thirdparty%2Fpdns.git

Cleanup
---

diff --git a/pdns/dnssecinfra.cc b/pdns/dnssecinfra.cc
index e4ded6aea3..63fb16fe8d 100644
--- 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 1be8123e7d..325b259ddf 100644
--- 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));