Parcourir la source

[master] forgot to apply one last suggestion in #812: renaming a method.

JINMEI Tatuya il y a 14 ans
Parent
commit
43f9ce0c56

+ 3 - 3
src/lib/dns/tests/tsigkey_unittest.cc

@@ -43,12 +43,12 @@ TEST_F(TSIGKeyTest, algorithmNames) {
 
     // Also check conversion to cryptolink definitions
     EXPECT_EQ(isc::cryptolink::MD5, TSIGKey(key_name, TSIGKey::HMACMD5_NAME(),
-                                            NULL, 0).getCryptoAlgorithm());
+                                            NULL, 0).getAlgorithm());
     EXPECT_EQ(isc::cryptolink::SHA1, TSIGKey(key_name, TSIGKey::HMACSHA1_NAME(),
-                                             NULL, 0).getCryptoAlgorithm());
+                                             NULL, 0).getAlgorithm());
     EXPECT_EQ(isc::cryptolink::SHA256, TSIGKey(key_name,
                                                TSIGKey::HMACSHA256_NAME(),
-                                               NULL, 0).getCryptoAlgorithm());
+                                               NULL, 0).getAlgorithm());
 }
 
 TEST_F(TSIGKeyTest, construct) {

+ 1 - 1
src/lib/dns/tsig.cc

@@ -141,7 +141,7 @@ TSIGContext::sign(const uint16_t qid, const void* const data,
     HMACPtr hmac(CryptoLink::getCryptoLink().createHMAC(
                      impl_->key_.getSecret(),
                      impl_->key_.getSecretLength(),
-                     impl_->key_.getCryptoAlgorithm()),
+                     impl_->key_.getAlgorithm()),
                  deleteHMAC);
 
     // If the context has previous MAC (either the Request MAC or its own

+ 1 - 1
src/lib/dns/tsigkey.cc

@@ -152,7 +152,7 @@ TSIGKey::getAlgorithmName() const {
 }
 
 isc::cryptolink::HashAlgorithm
-TSIGKey::getCryptoAlgorithm() const {
+TSIGKey::getAlgorithm() const {
     return (impl_->algorithm_);
 }
 

+ 1 - 1
src/lib/dns/tsigkey.h

@@ -145,7 +145,7 @@ public:
     const Name& getAlgorithmName() const;
 
     /// Return the hash algorithm name in the form of cryptolink::HashAlgorithm
-    isc::cryptolink::HashAlgorithm getCryptoAlgorithm() const;
+    isc::cryptolink::HashAlgorithm getAlgorithm() const;
 
     /// Return the length of the TSIG secret in bytes.
     size_t getSecretLength() const;