aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/mac/mac.h
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-12-11 15:28:38 -0500
committerJack Lloyd <[email protected]>2016-12-18 16:48:24 -0500
commitf3cb3edb512bdcab498d825886c3366c341b3f78 (patch)
tree645c73ec295a5a34f25d99903b6d9fa9751e86d3 /src/lib/mac/mac.h
parentc1dd21253c1f3188ff45d3ad47698efd08235ae8 (diff)
Convert to using standard uintN_t integer types
Renames a couple of functions for somewhat better name consistency, eg make_u32bit becomes make_uint32. The old typedefs remain for now since probably lots of application code uses them.
Diffstat (limited to 'src/lib/mac/mac.h')
-rw-r--r--src/lib/mac/mac.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/mac/mac.h b/src/lib/mac/mac.h
index d7808c1bf..44bdd3da4 100644
--- a/src/lib/mac/mac.h
+++ b/src/lib/mac/mac.h
@@ -63,7 +63,7 @@ class BOTAN_DLL MessageAuthenticationCode : public Buffered_Computation,
* Default implementation simply rejects all non-empty nonces
* since most hash/MAC algorithms do not support randomization
*/
- virtual void start_msg(const byte nonce[], size_t nonce_len)
+ virtual void start_msg(const uint8_t nonce[], size_t nonce_len)
{
BOTAN_UNUSED(nonce);
if(nonce_len > 0)
@@ -76,7 +76,7 @@ class BOTAN_DLL MessageAuthenticationCode : public Buffered_Computation,
* @param nonce the per message nonce
*/
template<typename Alloc>
- void start(const std::vector<byte, Alloc>& nonce)
+ void start(const std::vector<uint8_t, Alloc>& nonce)
{
start_msg(nonce.data(), nonce.size());
}
@@ -86,7 +86,7 @@ class BOTAN_DLL MessageAuthenticationCode : public Buffered_Computation,
* @param nonce the per message nonce
* @param nonce_len length of nonce
*/
- void start(const byte nonce[], size_t nonce_len)
+ void start(const uint8_t nonce[], size_t nonce_len)
{
start_msg(nonce, nonce_len);
}
@@ -105,14 +105,14 @@ class BOTAN_DLL MessageAuthenticationCode : public Buffered_Computation,
* @param length the length of param in
* @return true if the MAC is valid, false otherwise
*/
- virtual bool verify_mac(const byte in[], size_t length);
+ virtual bool verify_mac(const uint8_t in[], size_t length);
/**
* Verify a MAC.
* @param in the MAC to verify as a byte array
* @return true if the MAC is valid, false otherwise
*/
- virtual bool verify_mac(const std::vector<byte>& in)
+ virtual bool verify_mac(const std::vector<uint8_t>& in)
{
return verify_mac(in.data(), in.size());
}
@@ -122,7 +122,7 @@ class BOTAN_DLL MessageAuthenticationCode : public Buffered_Computation,
* @param in the MAC to verify as a byte array
* @return true if the MAC is valid, false otherwise
*/
- virtual bool verify_mac(const secure_vector<byte>& in)
+ virtual bool verify_mac(const secure_vector<uint8_t>& in)
{
return verify_mac(in.data(), in.size());
}