aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/mac/mac.cpp
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2015-09-19 07:43:45 -0400
committerJack Lloyd <[email protected]>2015-09-19 07:43:45 -0400
commite1ae1d68309573134fc1242c3bfb8a8ce0672737 (patch)
treed4cbfc7b2c1f70d06fa57403f533be5e434c869f /src/lib/mac/mac.cpp
parente2e0f8f2b595122c1f8acb3b3a46501f96a2b218 (diff)
Internal header cleanups
Only user-visible change is the removal of get_byte.h
Diffstat (limited to 'src/lib/mac/mac.cpp')
-rw-r--r--src/lib/mac/mac.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/mac/mac.cpp b/src/lib/mac/mac.cpp
index da94a1daf..8c1185c55 100644
--- a/src/lib/mac/mac.cpp
+++ b/src/lib/mac/mac.cpp
@@ -6,7 +6,7 @@
*/
#include <botan/mac.h>
-#include <botan/internal/mac_utils.h>
+#include <botan/internal/algo_registry.h>
#include <botan/mem_ops.h>
#if defined(BOTAN_HAS_CBC_MAC)
@@ -61,7 +61,6 @@ bool MessageAuthenticationCode::verify_mac(const byte mac[], size_t length)
return same_mem(our_mac.data(), mac, length);
}
-
#if defined(BOTAN_HAS_CBC_MAC)
BOTAN_REGISTER_NAMED_T(MessageAuthenticationCode, "CBC-MAC", CBC_MAC, CBC_MAC::make);
#endif
@@ -75,7 +74,7 @@ BOTAN_REGISTER_NAMED_T(MessageAuthenticationCode, "HMAC", HMAC, HMAC::make);
#endif
#if defined(BOTAN_HAS_POLY1305)
-BOTAN_REGISTER_MAC_NOARGS(Poly1305);
+BOTAN_REGISTER_T_NOARGS(MessageAuthenticationCode, Poly1305);
#endif
#if defined(BOTAN_HAS_SIPHASH)
@@ -83,7 +82,7 @@ BOTAN_REGISTER_NAMED_T_2LEN(MessageAuthenticationCode, SipHash, "SipHash", "base
#endif
#if defined(BOTAN_HAS_ANSI_X919_MAC)
-BOTAN_REGISTER_MAC_NAMED_NOARGS(ANSI_X919_MAC, "X9.19-MAC");
+BOTAN_REGISTER_NAMED_T(MessageAuthenticationCode, "X9.19-MAC", ANSI_X919_MAC, make_new_T<ANSI_X919_MAC>);
#endif
}