mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00: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>
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Fabio Estevam <festevam@gmail.com>
|
|
Date: Mon, 24 Aug 2020 11:09:53 -0300
|
|
Subject: [PATCH] crypto: arm/curve25519 - include <linux/scatterlist.h>
|
|
|
|
commit 6779d0e6b0fe193ab3010ea201782ca6f75a3862 upstream.
|
|
|
|
Building ARM allmodconfig leads to the following warnings:
|
|
|
|
arch/arm/crypto/curve25519-glue.c:73:12: error: implicit declaration of function 'sg_copy_to_buffer' [-Werror=implicit-function-declaration]
|
|
arch/arm/crypto/curve25519-glue.c:74:9: error: implicit declaration of function 'sg_nents_for_len' [-Werror=implicit-function-declaration]
|
|
arch/arm/crypto/curve25519-glue.c:88:11: error: implicit declaration of function 'sg_copy_from_buffer' [-Werror=implicit-function-declaration]
|
|
|
|
Include <linux/scatterlist.h> to fix such warnings
|
|
|
|
Reported-by: Olof's autobuilder <build@lixom.net>
|
|
Fixes: 0c3dc787a62a ("crypto: algapi - Remove skbuff.h inclusion")
|
|
Signed-off-by: Fabio Estevam <festevam@gmail.com>
|
|
Acked-by: Ard Biesheuvel <ardb@kernel.org>
|
|
Acked-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
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 | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/arch/arm/crypto/curve25519-glue.c
|
|
+++ b/arch/arm/crypto/curve25519-glue.c
|
|
@@ -16,6 +16,7 @@
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/jump_label.h>
|
|
+#include <linux/scatterlist.h>
|
|
#include <crypto/curve25519.h>
|
|
|
|
asmlinkage void curve25519_neon(u8 mypublic[CURVE25519_KEY_SIZE],
|