From 6aed36c1decc1f2fa76337941acb36076b0adc59 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 17 Sep 2018 03:58:17 +0200 Subject: poly1305: do not require simd context for arch --- src/crypto/zinc/selftest/chacha20poly1305.h | 2 +- src/crypto/zinc/selftest/poly1305.h | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/crypto/zinc/selftest') diff --git a/src/crypto/zinc/selftest/chacha20poly1305.h b/src/crypto/zinc/selftest/chacha20poly1305.h index f0ad51c..e5e8de5 100644 --- a/src/crypto/zinc/selftest/chacha20poly1305.h +++ b/src/crypto/zinc/selftest/chacha20poly1305.h @@ -7649,7 +7649,7 @@ chacha20poly1305_selftest_encrypt_bignonce(u8 *dst, const u8 *src, chacha20_state.counter[3] = get_unaligned_le32(nonce + 8); chacha20(&chacha20_state, b.block0, b.block0, sizeof(b.block0), simd_context); - poly1305_init(&poly1305_state, b.block0, simd_context); + poly1305_init(&poly1305_state, b.block0); poly1305_update(&poly1305_state, ad, ad_len, simd_context); poly1305_update(&poly1305_state, pad0, (0x10 - ad_len) & 0xf, simd_context); diff --git a/src/crypto/zinc/selftest/poly1305.h b/src/crypto/zinc/selftest/poly1305.h index 0f439db..d02941f 100644 --- a/src/crypto/zinc/selftest/poly1305.h +++ b/src/crypto/zinc/selftest/poly1305.h @@ -830,8 +830,7 @@ bool __init poly1305_selftest(void) memset(out, 0, sizeof(out)); memset(&poly1305, 0, sizeof(poly1305)); - poly1305_init(&poly1305, poly1305_testvecs[i].key, - simd_context); + poly1305_init(&poly1305, poly1305_testvecs[i].key); poly1305_update(&poly1305, poly1305_testvecs[i].input, poly1305_testvecs[i].ilen, simd_context); poly1305_final(&poly1305, out, simd_context); @@ -848,8 +847,7 @@ bool __init poly1305_selftest(void) for (j = 1; j < poly1305_testvecs[i].ilen - 1; ++j) { memset(out, 0, sizeof(out)); memset(&poly1305, 0, sizeof(poly1305)); - poly1305_init(&poly1305, poly1305_testvecs[i].key, - simd_context); + poly1305_init(&poly1305, poly1305_testvecs[i].key); poly1305_update(&poly1305, poly1305_testvecs[i].input, j, simd_context); poly1305_update(&poly1305, -- cgit v1.2.3-59-g8ed1b