From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 15 Dec 2021 13:29:59 +0000 (+0100)
Subject: Apply suggestions from code review
X-Git-Tag: auth-4.7.0-alpha1~67^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01498d87147700725de97a5567ff77cddd099f1f;p=thirdparty%2Fpdns.git

Apply suggestions from code review

Co-authored-by: Remi Gacogne <github@coredump.fr>
---

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 48f767a045..25fb93c433 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -3200,7 +3200,7 @@ try
   }
   else if (cmds.at(0) == "unset-nsec3") {
     if(cmds.size() < 2) {
-      cerr<<"Syntax: pdnsutil unset-nsec3 ZON"<<endl;
+      cerr<<"Syntax: pdnsutil unset-nsec3 ZONE"<<endl;
       return 0;
     }
     if (!dk.unsetNSEC3PARAM(DNSName(cmds.at(1)))) {
diff --git a/pdns/sha.hh b/pdns/sha.hh
index 18c445ee28..077b1db2cb 100644
--- a/pdns/sha.hh
+++ b/pdns/sha.hh
@@ -58,11 +58,11 @@ namespace pdns
 class SHADigest
 {
 public:
-  SHADigest(int bits)
+  SHADigest(unsigned int bits)
   {
     mdctx = EVP_MD_CTX_new();
     if (mdctx == nullptr) {
-      throw std::runtime_error("VSHADigest: P_MD_CTX_new failed");
+      throw std::runtime_error("SHADigest: EVP_MD_CTX_new failed");
     }
     switch (bits) {
     case 256:
@@ -90,7 +90,7 @@ public:
     }
   }
 
-  void process(const std::string& msg, size_t sz)
+  void process(const std::string& msg)
   {
     if (EVP_DigestUpdate(mdctx, msg.data(), msg.size()) == 0) {
       throw std::runtime_error("SHADigest: update error");
@@ -106,7 +106,7 @@ public:
       throw std::runtime_error("SHADigest: finalize error");
     }
     if (md_len != md_value.size()) {
-      throw std::runtime_error("SHADigest: inconsisten size");
+      throw std::runtime_error("SHADigest: inconsistent size");
     }
     return md_value;
   }
diff --git a/pdns/zonemd.cc b/pdns/zonemd.cc
index afebdfc1dd..c48357cdfe 100644
--- a/pdns/zonemd.cc
+++ b/pdns/zonemd.cc
@@ -30,7 +30,7 @@ void pdns::zonemdVerify(const DNSName& zone, ZoneParserTNG& zpt, bool& validatio
   validationDone = false;
   validationOK = false;
 
-  // scheme,hasalgo -> duplicate,zonemdrecord
+  // scheme,hashalgo -> duplicate,zonemdrecord
   struct ZoneMDAndDuplicateFlag
   {
     std::shared_ptr<ZONEMDRecordContent> record;
@@ -117,10 +117,10 @@ void pdns::zonemdVerify(const DNSName& zone, ZoneParserTNG& zpt, bool& validatio
   // A little helper
   auto hash = [&sha384digest, &sha512digest](const std::string& msg) {
     if (sha384digest) {
-      sha384digest->process(msg, msg.size());
+      sha384digest->process(msg);
     }
     if (sha512digest) {
-      sha512digest->process(msg, msg.size());
+      sha512digest->process(msg);
     }
   };