From 1c0ead7dd504b5df143878a49b1ee0a3ec65bfe1 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 4 Nov 2016 10:43:04 +0100 Subject: Test all three methods --- polybench.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/polybench.c b/polybench.c index 80eb9df..f5e50c3 100644 --- a/polybench.c +++ b/polybench.c @@ -4,7 +4,8 @@ #include #include -#define USE_FIRST_METHOD +/* Change this value to 1, 2, or 3. */ +#define USE_METHOD 1 #define POLY1305_BLOCK_SIZE 16 #define POLY1305_KEY_SIZE 32 @@ -45,18 +46,24 @@ static inline u32 and(u32 v, u32 mask) static void poly1305_init(struct poly1305_ctx *ctx, const u8 key[static POLY1305_KEY_SIZE]) { -#ifndef USE_FIRST_METHOD +#if USE_METHOD == 3 u32 t0, t1, t2, t3; #endif memset(ctx, 0, sizeof(struct poly1305_ctx)); /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */ -#ifdef USE_FIRST_METHOD +#if USE_METHOD == 1 + ctx->r[0] = (le32_to_cpuvp(key + 0) >> 0) & 0x3ffffff; + ctx->r[1] = (le32_to_cpuvp(key + 3) >> 2) & 0x3ffff03; + ctx->r[2] = (le32_to_cpuvp(key + 6) >> 4) & 0x3ffc0ff; + ctx->r[3] = (le32_to_cpuvp(key + 9) >> 6) & 0x3f03fff; + ctx->r[4] = (le32_to_cpuvp(key + 12) >> 8) & 0x00fffff; +#elif USE_METHOD == 2 ctx->r[0] = (le32_to_cpuvp(key + 0) >> 0) & 0x3ffffff; ctx->r[1] = (get_unaligned_le32(key + 3) >> 2) & 0x3ffff03; ctx->r[2] = (get_unaligned_le32(key + 6) >> 4) & 0x3ffc0ff; ctx->r[3] = (get_unaligned_le32(key + 9) >> 6) & 0x3f03fff; ctx->r[4] = (le32_to_cpuvp(key + 12) >> 8) & 0x00fffff; -#else +#elif USE_METHOD == 3 t0 = le32_to_cpuvp(key + 0); t1 = le32_to_cpuvp(key + 4); t2 = le32_to_cpuvp(key + 8); @@ -66,6 +73,8 @@ static void poly1305_init(struct poly1305_ctx *ctx, const u8 key[static POLY1305 ctx->r[2] = t1 & 0x3ffc0ff; t2 >>= 14; t2 |= t3 << 18; ctx->r[3] = t2 & 0x3f03fff; t3 >>= 8; ctx->r[4] = t3 & 0x00fffff; +#else +#error "USE_METHOD should be 1, 2, or 3." #endif ctx->s[0] = le32_to_cpuvp(key + 16); ctx->s[1] = le32_to_cpuvp(key + 20); @@ -79,7 +88,7 @@ static unsigned int poly1305_generic_blocks(struct poly1305_ctx *ctx, const u8 * u32 s1, s2, s3, s4; u32 h0, h1, h2, h3, h4; u64 d0, d1, d2, d3, d4; -#ifndef USE_FIRST_METHOD +#if USE_METHOD == 3 u32 t0, t1, t2, t3; #endif @@ -102,13 +111,19 @@ static unsigned int poly1305_generic_blocks(struct poly1305_ctx *ctx, const u8 * while (likely(srclen >= POLY1305_BLOCK_SIZE)) { /* h += m[i] */ -#ifdef USE_FIRST_METHOD +#if USE_METHOD == 1 + h0 += (le32_to_cpuvp(src + 0) >> 0) & 0x3ffffff; + h1 += (le32_to_cpuvp(src + 3) >> 2) & 0x3ffffff; + h2 += (le32_to_cpuvp(src + 6) >> 4) & 0x3ffffff; + h3 += (le32_to_cpuvp(src + 9) >> 6) & 0x3ffffff; + h4 += (le32_to_cpuvp(src + 12) >> 8) | hibit; +#elif USE_METHOD == 2 h0 += (le32_to_cpuvp(src + 0) >> 0) & 0x3ffffff; h1 += (get_unaligned_le32(src + 3) >> 2) & 0x3ffffff; h2 += (get_unaligned_le32(src + 6) >> 4) & 0x3ffffff; h3 += (get_unaligned_le32(src + 9) >> 6) & 0x3ffffff; h4 += (le32_to_cpuvp(src + 12) >> 8) | hibit; -#else +#elif USE_METHOD == 3 t0 = le32_to_cpuvp(src + 0); t1 = le32_to_cpuvp(src + 4); t2 = le32_to_cpuvp(src + 8); @@ -118,6 +133,8 @@ static unsigned int poly1305_generic_blocks(struct poly1305_ctx *ctx, const u8 * h2 += sr((((u64)t2 << 32) | t1), 20) & 0x3ffffff; h3 += sr((((u64)t3 << 32) | t2), 14) & 0x3ffffff; h4 += (t3 >> 8) | hibit; +#else +#error "USE_METHOD should be 1, 2, or 3." #endif /* h *= r */ -- cgit v1.2.3-59-g8ed1b