mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-20 06:28:12 +02:00
d540725871
Without this patch, the chacha block counter is not incremented on neon rounds, resulting in incorrect calculations and corrupt packets. This also switches to using `--no-numbered --zero-commit` so that future diffs are smaller. Reported-by: Hans Geiblinger <cybrnook2002@yahoo.com> Reviewed-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
Date: Wed, 11 Dec 2019 10:26:39 +0100
|
|
Subject: [PATCH] crypto: arm/curve25519 - add arch-specific key generation
|
|
function
|
|
|
|
commit 84faa307249b341f6ad8de3e1869d77a65e26669 upstream.
|
|
|
|
Somehow this was forgotten when Zinc was being split into oddly shaped
|
|
pieces, resulting in linker errors. The x86_64 glue has a specific key
|
|
generation implementation, but the Arm one does not. However, it can
|
|
still receive the NEON speedups by calling the ordinary DH function
|
|
using the base point.
|
|
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
Acked-by: Ard Biesheuvel <ardb@kernel.org>
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
---
|
|
arch/arm/crypto/curve25519-glue.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
--- a/arch/arm/crypto/curve25519-glue.c
|
|
+++ b/arch/arm/crypto/curve25519-glue.c
|
|
@@ -38,6 +38,13 @@ void curve25519_arch(u8 out[CURVE25519_K
|
|
}
|
|
EXPORT_SYMBOL(curve25519_arch);
|
|
|
|
+void curve25519_base_arch(u8 pub[CURVE25519_KEY_SIZE],
|
|
+ const u8 secret[CURVE25519_KEY_SIZE])
|
|
+{
|
|
+ return curve25519_arch(pub, secret, curve25519_base_point);
|
|
+}
|
|
+EXPORT_SYMBOL(curve25519_base_arch);
|
|
+
|
|
static int curve25519_set_secret(struct crypto_kpp *tfm, const void *buf,
|
|
unsigned int len)
|
|
{
|