2021-03-02 08:24:45 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
kernel: 5.4: import wireguard backport
Rather than using the clunky, old, slower wireguard-linux-compat out of
tree module, this commit does a patch-by-patch backport of upstream's
wireguard to 5.4. This specific backport is in widespread use, being
part of SUSE's enterprise kernel, Oracle's enterprise kernel, Google's
Android kernel, Gentoo's distro kernel, and probably more I've forgotten
about. It's definately the "more proper" way of adding wireguard to a
kernel than the ugly compat.h hell of the wireguard-linux-compat repo.
And most importantly for OpenWRT, it allows using the same module
configuration code for 5.10 as for 5.4, with no need for bifurcation.
These patches are from the backport tree which is maintained in the
open here: https://git.zx2c4.com/wireguard-linux/log/?h=backport-5.4.y
I'll be sending PRs to update this as needed.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2021-02-19 13:29:04 +00:00
|
|
|
From: Fabio Estevam <festevam@gmail.com>
|
|
|
|
|
Date: Mon, 24 Aug 2020 11:09:53 -0300
|
2021-03-02 08:24:45 +00:00
|
|
|
Subject: [PATCH] crypto: arm/curve25519 - include <linux/scatterlist.h>
|
kernel: 5.4: import wireguard backport
Rather than using the clunky, old, slower wireguard-linux-compat out of
tree module, this commit does a patch-by-patch backport of upstream's
wireguard to 5.4. This specific backport is in widespread use, being
part of SUSE's enterprise kernel, Oracle's enterprise kernel, Google's
Android kernel, Gentoo's distro kernel, and probably more I've forgotten
about. It's definately the "more proper" way of adding wireguard to a
kernel than the ugly compat.h hell of the wireguard-linux-compat repo.
And most importantly for OpenWRT, it allows using the same module
configuration code for 5.10 as for 5.4, with no need for bifurcation.
These patches are from the backport tree which is maintained in the
open here: https://git.zx2c4.com/wireguard-linux/log/?h=backport-5.4.y
I'll be sending PRs to update this as needed.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2021-02-19 13:29:04 +00:00
|
|
|
|
|
|
|
|
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],
|
