diff options
Diffstat (limited to 'src/lib/mac')
| -rw-r--r-- | src/lib/mac/info.txt | 4 | ||||
| -rw-r--r-- | src/lib/mac/mac_utils.h | 6 | ||||
| -rw-r--r-- | src/lib/mac/poly1305/poly1305_donna.h | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/mac/info.txt b/src/lib/mac/info.txt index 871e415ee..3931f22e2 100644 --- a/src/lib/mac/info.txt +++ b/src/lib/mac/info.txt @@ -1,7 +1,3 @@ -<requires> -algo_base -</requires> - <header:public> mac.h </header:public> diff --git a/src/lib/mac/mac_utils.h b/src/lib/mac/mac_utils.h index 84c954789..5b22da4a3 100644 --- a/src/lib/mac/mac_utils.h +++ b/src/lib/mac/mac_utils.h @@ -5,10 +5,10 @@ * Botan is released under the Simplified BSD License (see license.txt) */ -#ifndef BOTAN_MAC_UTIL_H__ -#define BOTAN_MAC_UTIL_H__ +#ifndef BOTAN_MAC_UTILS_H__ +#define BOTAN_MAC_UTILS_H__ -#include <botan/algo_registry.h> +#include <botan/internal/algo_registry.h> #include <botan/internal/xor_buf.h> #include <botan/loadstor.h> #include <botan/rotate.h> diff --git a/src/lib/mac/poly1305/poly1305_donna.h b/src/lib/mac/poly1305/poly1305_donna.h index 128d0359b..a5c9e1edf 100644 --- a/src/lib/mac/poly1305/poly1305_donna.h +++ b/src/lib/mac/poly1305/poly1305_donna.h @@ -107,7 +107,7 @@ void poly1305_finish(secure_vector<u64bit>& X, byte mac[16]) /* compute h + -p */ u64bit g0 = h0 + 5; c = (g0 >> 44); g0 &= 0xfffffffffff; u64bit g1 = h1 + c; c = (g1 >> 44); g1 &= 0xfffffffffff; - u64bit g2 = h2 + c - ((u64bit)1 << 42); + u64bit g2 = h2 + c - (static_cast<u64bit>(1) << 42); /* select h if h < p, or h + -p if h >= p */ c = (g2 >> ((sizeof(u64bit) * 8) - 1)) - 1; |