diff options
author | JINMEI Tatuya <jinmei@isc.org> | 2011-04-29 02:56:33 +0200 |
---|---|---|
committer | JINMEI Tatuya <jinmei@isc.org> | 2011-04-29 02:56:33 +0200 |
commit | 43f9ce0c56cd14c0349a8f3c3c9a5f4dc092f65a (patch) | |
tree | a611d2d322c09d8365d7f171e5177d50b333a7d6 /src/lib/dns | |
parent | [master] Merge branch 'trac812' with fixing conflicts and regression. (diff) | |
download | kea-43f9ce0c56cd14c0349a8f3c3c9a5f4dc092f65a.tar.xz kea-43f9ce0c56cd14c0349a8f3c3c9a5f4dc092f65a.zip |
[master] forgot to apply one last suggestion in #812: renaming a method.
Diffstat (limited to 'src/lib/dns')
-rw-r--r-- | src/lib/dns/tests/tsigkey_unittest.cc | 6 | ||||
-rw-r--r-- | src/lib/dns/tsig.cc | 2 | ||||
-rw-r--r-- | src/lib/dns/tsigkey.cc | 2 | ||||
-rw-r--r-- | src/lib/dns/tsigkey.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/dns/tests/tsigkey_unittest.cc b/src/lib/dns/tests/tsigkey_unittest.cc index 0354cb1b8e..96696d598b 100644 --- a/src/lib/dns/tests/tsigkey_unittest.cc +++ b/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) { diff --git a/src/lib/dns/tsig.cc b/src/lib/dns/tsig.cc index 7d85232901..c65d5aef76 100644 --- a/src/lib/dns/tsig.cc +++ b/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 diff --git a/src/lib/dns/tsigkey.cc b/src/lib/dns/tsigkey.cc index c2a4c413f3..c899423f8e 100644 --- a/src/lib/dns/tsigkey.cc +++ b/src/lib/dns/tsigkey.cc @@ -152,7 +152,7 @@ TSIGKey::getAlgorithmName() const { } isc::cryptolink::HashAlgorithm -TSIGKey::getCryptoAlgorithm() const { +TSIGKey::getAlgorithm() const { return (impl_->algorithm_); } diff --git a/src/lib/dns/tsigkey.h b/src/lib/dns/tsigkey.h index 4136278d66..02dd423282 100644 --- a/src/lib/dns/tsigkey.h +++ b/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; |