Rename `DNSCryptoKeyEngine` `checkKeys()` method to `checkKey()`

diff --git a/pdns/dbdnsseckeeper.cc b/pdns/dbdnsseckeeper.cc
index e62180c89f2c268e7654435c865e0cd80edbf150..46684976636a899e5c11daaf9f711d574d76cc4b 100644 (file)
--- a/pdns/dbdnsseckeeper.cc
+++ b/pdns/dbdnsseckeeper.cc
@@ -476,7 +476,7 @@ bool DNSSECKeeper::checkKeys(const DNSName& zone)
   for(const DNSBackend::KeyData &keydata : dbkeyset) {
     DNSKEYRecordContent dkrc;
     shared_ptr<DNSCryptoKeyEngine> dke(DNSCryptoKeyEngine::makeFromISCString(dkrc, keydata.content));
-    if (!dke->checkKeys()) {
+    if (!dke->checkKey()) {
       return false;
     }
   }

diff --git a/pdns/dnssecinfra.cc b/pdns/dnssecinfra.cc
index 30a350cc05831971685f5356fde4d1e06df79351..3fff9febf23f4693186d18b43eb21b95cf8cc173 100644 (file)
--- a/pdns/dnssecinfra.cc
+++ b/pdns/dnssecinfra.cc
@@ -39,7 +39,7 @@ DNSCryptoKeyEngine* DNSCryptoKeyEngine::makeFromISCFile(DNSKEYRecordContent& drc
   }
   fclose(fp);
   DNSCryptoKeyEngine* dke = makeFromISCString(drc, isc);
-  if(!dke->checkKeys()) {
+  if(!dke->checkKey()) {
     delete dke;
     throw runtime_error("Invalid DNS Private Key in file '"+string(fname));
   }
@@ -257,8 +257,8 @@ pair<unsigned int, unsigned int> DNSCryptoKeyEngine::testMakers(unsigned int alg
       stormap[toLower(key)]=raw;
     }
     dckeSign->fromISCMap(dkrc, stormap);
-    if(!dckeSign->checkKeys()) {
-      throw runtime_error("Verification of keys with creator "+dckeCreate->getName()+" with signer "+dckeSign->getName()+" and verifier "+dckeVerify->getName()+" failed");
+    if(!dckeSign->checkKey()) {
+      throw runtime_error("Verification of key with creator "+dckeCreate->getName()+" with signer "+dckeSign->getName()+" and verifier "+dckeVerify->getName()+" failed");
     }
   }
 

diff --git a/pdns/dnssecinfra.hh b/pdns/dnssecinfra.hh
index b9620f63e1f28cac450930b42825032f6d1d7f32..cab4f2e28e81d8623277a11c5d2cce0bf960f72e 100644 (file)
--- a/pdns/dnssecinfra.hh
+++ b/pdns/dnssecinfra.hh
@@ -38,7 +38,7 @@ class DNSCryptoKeyEngine
       throw std::runtime_error("Can't import from PEM string");
     }
     virtual void fromPublicKeyString(const std::string& content) = 0;
-    virtual bool checkKeys() const
+    virtual bool checkKey() const
     {
       return true;
     }

diff --git a/pdns/opensslsigners.cc b/pdns/opensslsigners.cc
index 02c4028ddef27187f9f2656711b04e374694f477..8c37dd7051b4b3b9f54414a5a781d6fa13c9afdf 100644 (file)
--- a/pdns/opensslsigners.cc
+++ b/pdns/opensslsigners.cc
@@ -99,7 +99,7 @@ public:
   std::string getPublicKeyString() const;
   void fromISCMap(DNSKEYRecordContent& drc, std::map<std::string, std::string>& stormap);
   void fromPublicKeyString(const std::string& content);
-  bool checkKeys() const override;
+  bool checkKey() const override;
 
   static DNSCryptoKeyEngine* maker(unsigned int algorithm)
   {
@@ -360,7 +360,7 @@ void OpenSSLRSADNSCryptoKeyEngine::fromISCMap(DNSKEYRecordContent& drc, std::map
   d_key = key;
 }
 
-bool OpenSSLRSADNSCryptoKeyEngine::checkKeys() const
+bool OpenSSLRSADNSCryptoKeyEngine::checkKey() const
 {
   return (RSA_check_key(d_key) == 1);
 }
@@ -471,7 +471,7 @@ public:
   std::string getPublicKeyString() const;
   void fromISCMap(DNSKEYRecordContent& drc, std::map<std::string, std::string>& stormap);
   void fromPublicKeyString(const std::string& content);
-  bool checkKeys() const override;
+  bool checkKey() const override;
 
   static DNSCryptoKeyEngine* maker(unsigned int algorithm)
   {
@@ -680,7 +680,7 @@ void OpenSSLECDSADNSCryptoKeyEngine::fromISCMap(DNSKEYRecordContent& drc, std::m
   EC_POINT_free(pub_key);
 }
 
-bool OpenSSLECDSADNSCryptoKeyEngine::checkKeys() const
+bool OpenSSLECDSADNSCryptoKeyEngine::checkKey() const
 {
   return (EC_KEY_check_key(d_eckey) == 1);
 }