aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/pbkdf
diff options
context:
space:
mode:
authorRenĂ© Korthaus <[email protected]>2015-12-23 11:52:19 +0100
committerJack Lloyd <[email protected]>2016-01-08 19:09:51 -0500
commitd22bc10cd4f67924acd82bcd46a31e3de3b20ce3 (patch)
tree58459585e6675cd799b6ef5900be026825cd6f9d /src/lib/pbkdf
parent2fbfdd7e5afb5e888fd8c0b56c6df09e2bdeaca7 (diff)
Mass-prefix member vars with m_
Diffstat (limited to 'src/lib/pbkdf')
-rw-r--r--src/lib/pbkdf/pbkdf2/pbkdf2.cpp2
-rw-r--r--src/lib/pbkdf/pbkdf2/pbkdf2.h8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/pbkdf/pbkdf2/pbkdf2.cpp b/src/lib/pbkdf/pbkdf2/pbkdf2.cpp
index 30cf7cbdf..94c587f05 100644
--- a/src/lib/pbkdf/pbkdf2/pbkdf2.cpp
+++ b/src/lib/pbkdf/pbkdf2/pbkdf2.cpp
@@ -122,7 +122,7 @@ PKCS5_PBKDF2::pbkdf(byte key[], size_t key_len,
size_t iterations,
std::chrono::milliseconds msec) const
{
- return pbkdf2(*mac.get(), key, key_len, passphrase, salt, salt_len, iterations, msec);
+ return pbkdf2(*m_mac.get(), key, key_len, passphrase, salt, salt_len, iterations, msec);
}
diff --git a/src/lib/pbkdf/pbkdf2/pbkdf2.h b/src/lib/pbkdf/pbkdf2/pbkdf2.h
index d74410b89..5a03e9ff5 100644
--- a/src/lib/pbkdf/pbkdf2/pbkdf2.h
+++ b/src/lib/pbkdf/pbkdf2/pbkdf2.h
@@ -30,12 +30,12 @@ class BOTAN_DLL PKCS5_PBKDF2 : public PBKDF
public:
std::string name() const override
{
- return "PBKDF2(" + mac->name() + ")";
+ return "PBKDF2(" + m_mac->name() + ")";
}
PBKDF* clone() const override
{
- return new PKCS5_PBKDF2(mac->clone());
+ return new PKCS5_PBKDF2(m_mac->clone());
}
size_t pbkdf(byte output_buf[], size_t output_len,
@@ -48,11 +48,11 @@ class BOTAN_DLL PKCS5_PBKDF2 : public PBKDF
* Create a PKCS #5 instance using the specified message auth code
* @param mac_fn the MAC object to use as PRF
*/
- PKCS5_PBKDF2(MessageAuthenticationCode* mac_fn) : mac(mac_fn) {}
+ PKCS5_PBKDF2(MessageAuthenticationCode* mac_fn) : m_mac(mac_fn) {}
static PKCS5_PBKDF2* make(const Spec& spec);
private:
- std::unique_ptr<MessageAuthenticationCode> mac;
+ std::unique_ptr<MessageAuthenticationCode> m_mac;
};
}