git.openwrt.org Git - openwrt/staging/aparcar.git/blob

   1 From 722ccb5da4bab4e142e4dc1eea10406a08547c7b Mon Sep 17 00:00:00 2001
   2 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
   3 Date: Fri, 17 Jan 2020 11:42:22 +0100
   4 Subject: [PATCH 048/124] crypto: x86/poly1305 - emit does base conversion
   5  itself
   6
   7 commit f9e7fe32a792726186301423ff63a465d63386e1 upstream.
   8
   9 The emit code does optional base conversion itself in assembly, so we
  10 don't need to do that here. Also, neither one of these functions uses
  11 simd instructions, so checking for that doesn't make sense either.
  12
  13 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  14 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  15 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  16 ---
  17  arch/x86/crypto/poly1305_glue.c | 8 ++------
  18  1 file changed, 2 insertions(+), 6 deletions(-)
  19
  20 --- a/arch/x86/crypto/poly1305_glue.c
  21 +++ b/arch/x86/crypto/poly1305_glue.c
  22 @@ -123,13 +123,9 @@ static void poly1305_simd_blocks(void *c
  23  static void poly1305_simd_emit(void *ctx, u8 mac[POLY1305_DIGEST_SIZE],
  24                                const u32 nonce[4])
  25  {
  26 -       struct poly1305_arch_internal *state = ctx;
  27 -
  28 -       if (!IS_ENABLED(CONFIG_AS_AVX) || !static_branch_likely(&poly1305_use_avx) ||
  29 -           !state->is_base2_26 || !crypto_simd_usable()) {
  30 -               convert_to_base2_64(ctx);
  31 +       if (!IS_ENABLED(CONFIG_AS_AVX) || !static_branch_likely(&poly1305_use_avx))
  32                 poly1305_emit_x86_64(ctx, mac, nonce);
  33 -       } else
  34 +       else
  35                 poly1305_emit_avx(ctx, mac, nonce);
  36  }
  37