From 45c2bc60f4d9647d84329366994251ea558cff7b Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 3 May 2016 14:40:32 +0200
Subject: [PATCH] Rename `DNSCryptoKeyEngine` `checkKeys()` method to
 `checkKey()`

---
 pdns/dbdnsseckeeper.cc | 2 +-
 pdns/dnssecinfra.cc    | 6 +++---
 pdns/dnssecinfra.hh    | 2 +-
 pdns/opensslsigners.cc | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pdns/dbdnsseckeeper.cc b/pdns/dbdnsseckeeper.cc
index e62180c89f..4668497663 100644
--- 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 30a350cc05..3fff9febf2 100644
--- 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 b9620f63e1..cab4f2e28e 100644
--- 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 02c4028dde..8c37dd7051 100644
--- 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);
 }
-- 
2.47.2