mirror of
https://github.com/Fishwaldo/build.git
synced 2025-04-01 11:41:42 +00:00
Add crypto patch to DEV branches and enable PPP config in sun50i
https://github.com/armbian/build/issues/701
This commit is contained in:
Igor Pecovnik
parent
78ff3e2f4f
commit
db42fa4cc6
3 changed files with 409 additions and 18 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm64 4.11.1 Kernel Configuration
|
# Linux/arm64 4.11.6 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_ARM64=y
|
CONFIG_ARM64=y
|
||||||
CONFIG_64BIT=y
|
CONFIG_64BIT=y
|
||||||
|
|
@ -1707,8 +1707,19 @@ CONFIG_REALTEK_PHY=y
|
||||||
# CONFIG_VITESSE_PHY is not set
|
# CONFIG_VITESSE_PHY is not set
|
||||||
# CONFIG_XILINX_GMII2RGMII is not set
|
# CONFIG_XILINX_GMII2RGMII is not set
|
||||||
# CONFIG_MICREL_KS8995MA is not set
|
# CONFIG_MICREL_KS8995MA is not set
|
||||||
# CONFIG_PPP is not set
|
CONFIG_PPP=m
|
||||||
|
CONFIG_PPP_BSDCOMP=m
|
||||||
|
CONFIG_PPP_DEFLATE=m
|
||||||
|
CONFIG_PPP_FILTER=y
|
||||||
|
CONFIG_PPP_MPPE=m
|
||||||
|
CONFIG_PPP_MULTILINK=y
|
||||||
|
CONFIG_PPPOE=m
|
||||||
|
CONFIG_PPTP=m
|
||||||
|
CONFIG_PPPOL2TP=m
|
||||||
|
CONFIG_PPP_ASYNC=m
|
||||||
|
CONFIG_PPP_SYNC_TTY=m
|
||||||
# CONFIG_SLIP is not set
|
# CONFIG_SLIP is not set
|
||||||
|
CONFIG_SLHC=m
|
||||||
CONFIG_USB_NET_DRIVERS=y
|
CONFIG_USB_NET_DRIVERS=y
|
||||||
# CONFIG_USB_CATC is not set
|
# CONFIG_USB_CATC is not set
|
||||||
# CONFIG_USB_KAWETH is not set
|
# CONFIG_USB_KAWETH is not set
|
||||||
|
|
@ -3525,22 +3536,6 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
|
||||||
# CONFIG_USB_GADGET_XILINX is not set
|
# CONFIG_USB_GADGET_XILINX is not set
|
||||||
# CONFIG_USB_DUMMY_HCD is not set
|
# CONFIG_USB_DUMMY_HCD is not set
|
||||||
# CONFIG_USB_CONFIGFS is not set
|
# CONFIG_USB_CONFIGFS is not set
|
||||||
# CONFIG_USB_ZERO is not set
|
|
||||||
# CONFIG_USB_AUDIO is not set
|
|
||||||
# CONFIG_USB_ETH is not set
|
|
||||||
# CONFIG_USB_G_NCM is not set
|
|
||||||
# CONFIG_USB_GADGETFS is not set
|
|
||||||
# CONFIG_USB_FUNCTIONFS is not set
|
|
||||||
# CONFIG_USB_MASS_STORAGE is not set
|
|
||||||
# CONFIG_USB_G_SERIAL is not set
|
|
||||||
# CONFIG_USB_MIDI_GADGET is not set
|
|
||||||
# CONFIG_USB_G_PRINTER is not set
|
|
||||||
# CONFIG_USB_CDC_COMPOSITE is not set
|
|
||||||
# CONFIG_USB_G_ACM_MS is not set
|
|
||||||
# CONFIG_USB_G_MULTI is not set
|
|
||||||
# CONFIG_USB_G_HID is not set
|
|
||||||
# CONFIG_USB_G_DBGP is not set
|
|
||||||
# CONFIG_USB_G_WEBCAM is not set
|
|
||||||
CONFIG_USB_LED_TRIG=y
|
CONFIG_USB_LED_TRIG=y
|
||||||
# CONFIG_USB_ULPI_BUS is not set
|
# CONFIG_USB_ULPI_BUS is not set
|
||||||
# CONFIG_UWB is not set
|
# CONFIG_UWB is not set
|
||||||
|
|
|
||||||
198
patch/kernel/sun50i-dev/resolve-crypto-deps.patch
Normal file
198
patch/kernel/sun50i-dev/resolve-crypto-deps.patch
Normal file
|
|
@ -0,0 +1,198 @@
|
||||||
|
From b56f5cbc7e08ec7d31c42fc41e5247677f20b143 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||||
|
Date: Tue, 14 Feb 2017 21:51:01 +0000
|
||||||
|
Subject: crypto: arm/aes-neonbs - resolve fallback cipher at runtime
|
||||||
|
|
||||||
|
Currently, the bit sliced NEON AES code for ARM has a link time
|
||||||
|
dependency on the scalar ARM asm implementation, which it uses as a
|
||||||
|
fallback to perform CBC encryption and the encryption of the initial
|
||||||
|
XTS tweak.
|
||||||
|
|
||||||
|
The bit sliced NEON code is both fast and time invariant, which makes
|
||||||
|
it a reasonable default on hardware that supports it. However, the
|
||||||
|
ARM asm code it pulls in is not time invariant, and due to the way it
|
||||||
|
is linked in, cannot be overridden by the new generic time invariant
|
||||||
|
driver. In fact, it will not be used at all, given that the ARM asm
|
||||||
|
code registers itself as a cipher with a priority that exceeds the
|
||||||
|
priority of the fixed time cipher.
|
||||||
|
|
||||||
|
So remove the link time dependency, and allocate the fallback cipher
|
||||||
|
via the crypto API. Note that this requires this driver's module_init
|
||||||
|
call to be replaced with late_initcall, so that the (possibly generic)
|
||||||
|
fallback cipher is guaranteed to be available when the builtin test
|
||||||
|
is performed at registration time.
|
||||||
|
|
||||||
|
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||||
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
||||||
|
---
|
||||||
|
arch/arm/crypto/Kconfig | 2 +-
|
||||||
|
arch/arm/crypto/aes-neonbs-glue.c | 60 +++++++++++++++++++++++++++++----------
|
||||||
|
2 files changed, 46 insertions(+), 16 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig
|
||||||
|
index a8fce93..b9adedc 100644
|
||||||
|
--- a/arch/arm/crypto/Kconfig
|
||||||
|
+++ b/arch/arm/crypto/Kconfig
|
||||||
|
@@ -73,7 +73,7 @@ config CRYPTO_AES_ARM_BS
|
||||||
|
depends on KERNEL_MODE_NEON
|
||||||
|
select CRYPTO_BLKCIPHER
|
||||||
|
select CRYPTO_SIMD
|
||||||
|
- select CRYPTO_AES_ARM
|
||||||
|
+ select CRYPTO_AES
|
||||||
|
help
|
||||||
|
Use a faster and more secure NEON based implementation of AES in CBC,
|
||||||
|
CTR and XTS modes
|
||||||
|
diff --git a/arch/arm/crypto/aes-neonbs-glue.c b/arch/arm/crypto/aes-neonbs-glue.c
|
||||||
|
index 2920b96..c763779 100644
|
||||||
|
--- a/arch/arm/crypto/aes-neonbs-glue.c
|
||||||
|
+++ b/arch/arm/crypto/aes-neonbs-glue.c
|
||||||
|
@@ -42,9 +42,6 @@ asmlinkage void aesbs_xts_encrypt(u8 out[], u8 const in[], u8 const rk[],
|
||||||
|
asmlinkage void aesbs_xts_decrypt(u8 out[], u8 const in[], u8 const rk[],
|
||||||
|
int rounds, int blocks, u8 iv[]);
|
||||||
|
|
||||||
|
-asmlinkage void __aes_arm_encrypt(const u32 rk[], int rounds, const u8 in[],
|
||||||
|
- u8 out[]);
|
||||||
|
-
|
||||||
|
struct aesbs_ctx {
|
||||||
|
int rounds;
|
||||||
|
u8 rk[13 * (8 * AES_BLOCK_SIZE) + 32] __aligned(AES_BLOCK_SIZE);
|
||||||
|
@@ -52,12 +49,12 @@ struct aesbs_ctx {
|
||||||
|
|
||||||
|
struct aesbs_cbc_ctx {
|
||||||
|
struct aesbs_ctx key;
|
||||||
|
- u32 enc[AES_MAX_KEYLENGTH_U32];
|
||||||
|
+ struct crypto_cipher *enc_tfm;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct aesbs_xts_ctx {
|
||||||
|
struct aesbs_ctx key;
|
||||||
|
- u32 twkey[AES_MAX_KEYLENGTH_U32];
|
||||||
|
+ struct crypto_cipher *tweak_tfm;
|
||||||
|
};
|
||||||
|
|
||||||
|
static int aesbs_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||||
|
@@ -132,20 +129,18 @@ static int aesbs_cbc_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||||
|
|
||||||
|
ctx->key.rounds = 6 + key_len / 4;
|
||||||
|
|
||||||
|
- memcpy(ctx->enc, rk.key_enc, sizeof(ctx->enc));
|
||||||
|
-
|
||||||
|
kernel_neon_begin();
|
||||||
|
aesbs_convert_key(ctx->key.rk, rk.key_enc, ctx->key.rounds);
|
||||||
|
kernel_neon_end();
|
||||||
|
|
||||||
|
- return 0;
|
||||||
|
+ return crypto_cipher_setkey(ctx->enc_tfm, in_key, key_len);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void cbc_encrypt_one(struct crypto_skcipher *tfm, const u8 *src, u8 *dst)
|
||||||
|
{
|
||||||
|
struct aesbs_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);
|
||||||
|
|
||||||
|
- __aes_arm_encrypt(ctx->enc, ctx->key.rounds, src, dst);
|
||||||
|
+ crypto_cipher_encrypt_one(ctx->enc_tfm, dst, src);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int cbc_encrypt(struct skcipher_request *req)
|
||||||
|
@@ -181,6 +176,23 @@ static int cbc_decrypt(struct skcipher_request *req)
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static int cbc_init(struct crypto_tfm *tfm)
|
||||||
|
+{
|
||||||
|
+ struct aesbs_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||||
|
+
|
||||||
|
+ ctx->enc_tfm = crypto_alloc_cipher("aes", 0, 0);
|
||||||
|
+ if (IS_ERR(ctx->enc_tfm))
|
||||||
|
+ return PTR_ERR(ctx->enc_tfm);
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void cbc_exit(struct crypto_tfm *tfm)
|
||||||
|
+{
|
||||||
|
+ struct aesbs_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||||
|
+
|
||||||
|
+ crypto_free_cipher(ctx->enc_tfm);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static int ctr_encrypt(struct skcipher_request *req)
|
||||||
|
{
|
||||||
|
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
|
||||||
|
@@ -228,7 +240,6 @@ static int aesbs_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||||
|
unsigned int key_len)
|
||||||
|
{
|
||||||
|
struct aesbs_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
|
||||||
|
- struct crypto_aes_ctx rk;
|
||||||
|
int err;
|
||||||
|
|
||||||
|
err = xts_verify_key(tfm, in_key, key_len);
|
||||||
|
@@ -236,15 +247,30 @@ static int aesbs_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||||
|
return err;
|
||||||
|
|
||||||
|
key_len /= 2;
|
||||||
|
- err = crypto_aes_expand_key(&rk, in_key + key_len, key_len);
|
||||||
|
+ err = crypto_cipher_setkey(ctx->tweak_tfm, in_key + key_len, key_len);
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
|
||||||
|
- memcpy(ctx->twkey, rk.key_enc, sizeof(ctx->twkey));
|
||||||
|
-
|
||||||
|
return aesbs_setkey(tfm, in_key, key_len);
|
||||||
|
}
|
||||||
|
|
||||||
|
+static int xts_init(struct crypto_tfm *tfm)
|
||||||
|
+{
|
||||||
|
+ struct aesbs_xts_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||||
|
+
|
||||||
|
+ ctx->tweak_tfm = crypto_alloc_cipher("aes", 0, 0);
|
||||||
|
+ if (IS_ERR(ctx->tweak_tfm))
|
||||||
|
+ return PTR_ERR(ctx->tweak_tfm);
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void xts_exit(struct crypto_tfm *tfm)
|
||||||
|
+{
|
||||||
|
+ struct aesbs_xts_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||||
|
+
|
||||||
|
+ crypto_free_cipher(ctx->tweak_tfm);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static int __xts_crypt(struct skcipher_request *req,
|
||||||
|
void (*fn)(u8 out[], u8 const in[], u8 const rk[],
|
||||||
|
int rounds, int blocks, u8 iv[]))
|
||||||
|
@@ -256,7 +282,7 @@ static int __xts_crypt(struct skcipher_request *req,
|
||||||
|
|
||||||
|
err = skcipher_walk_virt(&walk, req, true);
|
||||||
|
|
||||||
|
- __aes_arm_encrypt(ctx->twkey, ctx->key.rounds, walk.iv, walk.iv);
|
||||||
|
+ crypto_cipher_encrypt_one(ctx->tweak_tfm, walk.iv, walk.iv);
|
||||||
|
|
||||||
|
kernel_neon_begin();
|
||||||
|
while (walk.nbytes >= AES_BLOCK_SIZE) {
|
||||||
|
@@ -309,6 +335,8 @@ static struct skcipher_alg aes_algs[] = { {
|
||||||
|
.base.cra_ctxsize = sizeof(struct aesbs_cbc_ctx),
|
||||||
|
.base.cra_module = THIS_MODULE,
|
||||||
|
.base.cra_flags = CRYPTO_ALG_INTERNAL,
|
||||||
|
+ .base.cra_init = cbc_init,
|
||||||
|
+ .base.cra_exit = cbc_exit,
|
||||||
|
|
||||||
|
.min_keysize = AES_MIN_KEY_SIZE,
|
||||||
|
.max_keysize = AES_MAX_KEY_SIZE,
|
||||||
|
@@ -342,6 +370,8 @@ static struct skcipher_alg aes_algs[] = { {
|
||||||
|
.base.cra_ctxsize = sizeof(struct aesbs_xts_ctx),
|
||||||
|
.base.cra_module = THIS_MODULE,
|
||||||
|
.base.cra_flags = CRYPTO_ALG_INTERNAL,
|
||||||
|
+ .base.cra_init = xts_init,
|
||||||
|
+ .base.cra_exit = xts_exit,
|
||||||
|
|
||||||
|
.min_keysize = 2 * AES_MIN_KEY_SIZE,
|
||||||
|
.max_keysize = 2 * AES_MAX_KEY_SIZE,
|
||||||
|
@@ -402,5 +432,5 @@ unregister_simds:
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
-module_init(aes_init);
|
||||||
|
+late_initcall(aes_init);
|
||||||
|
module_exit(aes_exit);
|
||||||
|
--
|
||||||
|
cgit v1.1
|
||||||
198
patch/kernel/sun8i-dev/resolve-crypto-deps.patch
Normal file
198
patch/kernel/sun8i-dev/resolve-crypto-deps.patch
Normal file
|
|
@ -0,0 +1,198 @@
|
||||||
|
From b56f5cbc7e08ec7d31c42fc41e5247677f20b143 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||||
|
Date: Tue, 14 Feb 2017 21:51:01 +0000
|
||||||
|
Subject: crypto: arm/aes-neonbs - resolve fallback cipher at runtime
|
||||||
|
|
||||||
|
Currently, the bit sliced NEON AES code for ARM has a link time
|
||||||
|
dependency on the scalar ARM asm implementation, which it uses as a
|
||||||
|
fallback to perform CBC encryption and the encryption of the initial
|
||||||
|
XTS tweak.
|
||||||
|
|
||||||
|
The bit sliced NEON code is both fast and time invariant, which makes
|
||||||
|
it a reasonable default on hardware that supports it. However, the
|
||||||
|
ARM asm code it pulls in is not time invariant, and due to the way it
|
||||||
|
is linked in, cannot be overridden by the new generic time invariant
|
||||||
|
driver. In fact, it will not be used at all, given that the ARM asm
|
||||||
|
code registers itself as a cipher with a priority that exceeds the
|
||||||
|
priority of the fixed time cipher.
|
||||||
|
|
||||||
|
So remove the link time dependency, and allocate the fallback cipher
|
||||||
|
via the crypto API. Note that this requires this driver's module_init
|
||||||
|
call to be replaced with late_initcall, so that the (possibly generic)
|
||||||
|
fallback cipher is guaranteed to be available when the builtin test
|
||||||
|
is performed at registration time.
|
||||||
|
|
||||||
|
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||||
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
||||||
|
---
|
||||||
|
arch/arm/crypto/Kconfig | 2 +-
|
||||||
|
arch/arm/crypto/aes-neonbs-glue.c | 60 +++++++++++++++++++++++++++++----------
|
||||||
|
2 files changed, 46 insertions(+), 16 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig
|
||||||
|
index a8fce93..b9adedc 100644
|
||||||
|
--- a/arch/arm/crypto/Kconfig
|
||||||
|
+++ b/arch/arm/crypto/Kconfig
|
||||||
|
@@ -73,7 +73,7 @@ config CRYPTO_AES_ARM_BS
|
||||||
|
depends on KERNEL_MODE_NEON
|
||||||
|
select CRYPTO_BLKCIPHER
|
||||||
|
select CRYPTO_SIMD
|
||||||
|
- select CRYPTO_AES_ARM
|
||||||
|
+ select CRYPTO_AES
|
||||||
|
help
|
||||||
|
Use a faster and more secure NEON based implementation of AES in CBC,
|
||||||
|
CTR and XTS modes
|
||||||
|
diff --git a/arch/arm/crypto/aes-neonbs-glue.c b/arch/arm/crypto/aes-neonbs-glue.c
|
||||||
|
index 2920b96..c763779 100644
|
||||||
|
--- a/arch/arm/crypto/aes-neonbs-glue.c
|
||||||
|
+++ b/arch/arm/crypto/aes-neonbs-glue.c
|
||||||
|
@@ -42,9 +42,6 @@ asmlinkage void aesbs_xts_encrypt(u8 out[], u8 const in[], u8 const rk[],
|
||||||
|
asmlinkage void aesbs_xts_decrypt(u8 out[], u8 const in[], u8 const rk[],
|
||||||
|
int rounds, int blocks, u8 iv[]);
|
||||||
|
|
||||||
|
-asmlinkage void __aes_arm_encrypt(const u32 rk[], int rounds, const u8 in[],
|
||||||
|
- u8 out[]);
|
||||||
|
-
|
||||||
|
struct aesbs_ctx {
|
||||||
|
int rounds;
|
||||||
|
u8 rk[13 * (8 * AES_BLOCK_SIZE) + 32] __aligned(AES_BLOCK_SIZE);
|
||||||
|
@@ -52,12 +49,12 @@ struct aesbs_ctx {
|
||||||
|
|
||||||
|
struct aesbs_cbc_ctx {
|
||||||
|
struct aesbs_ctx key;
|
||||||
|
- u32 enc[AES_MAX_KEYLENGTH_U32];
|
||||||
|
+ struct crypto_cipher *enc_tfm;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct aesbs_xts_ctx {
|
||||||
|
struct aesbs_ctx key;
|
||||||
|
- u32 twkey[AES_MAX_KEYLENGTH_U32];
|
||||||
|
+ struct crypto_cipher *tweak_tfm;
|
||||||
|
};
|
||||||
|
|
||||||
|
static int aesbs_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||||
|
@@ -132,20 +129,18 @@ static int aesbs_cbc_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||||
|
|
||||||
|
ctx->key.rounds = 6 + key_len / 4;
|
||||||
|
|
||||||
|
- memcpy(ctx->enc, rk.key_enc, sizeof(ctx->enc));
|
||||||
|
-
|
||||||
|
kernel_neon_begin();
|
||||||
|
aesbs_convert_key(ctx->key.rk, rk.key_enc, ctx->key.rounds);
|
||||||
|
kernel_neon_end();
|
||||||
|
|
||||||
|
- return 0;
|
||||||
|
+ return crypto_cipher_setkey(ctx->enc_tfm, in_key, key_len);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void cbc_encrypt_one(struct crypto_skcipher *tfm, const u8 *src, u8 *dst)
|
||||||
|
{
|
||||||
|
struct aesbs_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);
|
||||||
|
|
||||||
|
- __aes_arm_encrypt(ctx->enc, ctx->key.rounds, src, dst);
|
||||||
|
+ crypto_cipher_encrypt_one(ctx->enc_tfm, dst, src);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int cbc_encrypt(struct skcipher_request *req)
|
||||||
|
@@ -181,6 +176,23 @@ static int cbc_decrypt(struct skcipher_request *req)
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static int cbc_init(struct crypto_tfm *tfm)
|
||||||
|
+{
|
||||||
|
+ struct aesbs_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||||
|
+
|
||||||
|
+ ctx->enc_tfm = crypto_alloc_cipher("aes", 0, 0);
|
||||||
|
+ if (IS_ERR(ctx->enc_tfm))
|
||||||
|
+ return PTR_ERR(ctx->enc_tfm);
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void cbc_exit(struct crypto_tfm *tfm)
|
||||||
|
+{
|
||||||
|
+ struct aesbs_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||||
|
+
|
||||||
|
+ crypto_free_cipher(ctx->enc_tfm);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static int ctr_encrypt(struct skcipher_request *req)
|
||||||
|
{
|
||||||
|
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
|
||||||
|
@@ -228,7 +240,6 @@ static int aesbs_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||||
|
unsigned int key_len)
|
||||||
|
{
|
||||||
|
struct aesbs_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
|
||||||
|
- struct crypto_aes_ctx rk;
|
||||||
|
int err;
|
||||||
|
|
||||||
|
err = xts_verify_key(tfm, in_key, key_len);
|
||||||
|
@@ -236,15 +247,30 @@ static int aesbs_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||||
|
return err;
|
||||||
|
|
||||||
|
key_len /= 2;
|
||||||
|
- err = crypto_aes_expand_key(&rk, in_key + key_len, key_len);
|
||||||
|
+ err = crypto_cipher_setkey(ctx->tweak_tfm, in_key + key_len, key_len);
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
|
||||||
|
- memcpy(ctx->twkey, rk.key_enc, sizeof(ctx->twkey));
|
||||||
|
-
|
||||||
|
return aesbs_setkey(tfm, in_key, key_len);
|
||||||
|
}
|
||||||
|
|
||||||
|
+static int xts_init(struct crypto_tfm *tfm)
|
||||||
|
+{
|
||||||
|
+ struct aesbs_xts_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||||
|
+
|
||||||
|
+ ctx->tweak_tfm = crypto_alloc_cipher("aes", 0, 0);
|
||||||
|
+ if (IS_ERR(ctx->tweak_tfm))
|
||||||
|
+ return PTR_ERR(ctx->tweak_tfm);
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void xts_exit(struct crypto_tfm *tfm)
|
||||||
|
+{
|
||||||
|
+ struct aesbs_xts_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||||
|
+
|
||||||
|
+ crypto_free_cipher(ctx->tweak_tfm);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static int __xts_crypt(struct skcipher_request *req,
|
||||||
|
void (*fn)(u8 out[], u8 const in[], u8 const rk[],
|
||||||
|
int rounds, int blocks, u8 iv[]))
|
||||||
|
@@ -256,7 +282,7 @@ static int __xts_crypt(struct skcipher_request *req,
|
||||||
|
|
||||||
|
err = skcipher_walk_virt(&walk, req, true);
|
||||||
|
|
||||||
|
- __aes_arm_encrypt(ctx->twkey, ctx->key.rounds, walk.iv, walk.iv);
|
||||||
|
+ crypto_cipher_encrypt_one(ctx->tweak_tfm, walk.iv, walk.iv);
|
||||||
|
|
||||||
|
kernel_neon_begin();
|
||||||
|
while (walk.nbytes >= AES_BLOCK_SIZE) {
|
||||||
|
@@ -309,6 +335,8 @@ static struct skcipher_alg aes_algs[] = { {
|
||||||
|
.base.cra_ctxsize = sizeof(struct aesbs_cbc_ctx),
|
||||||
|
.base.cra_module = THIS_MODULE,
|
||||||
|
.base.cra_flags = CRYPTO_ALG_INTERNAL,
|
||||||
|
+ .base.cra_init = cbc_init,
|
||||||
|
+ .base.cra_exit = cbc_exit,
|
||||||
|
|
||||||
|
.min_keysize = AES_MIN_KEY_SIZE,
|
||||||
|
.max_keysize = AES_MAX_KEY_SIZE,
|
||||||
|
@@ -342,6 +370,8 @@ static struct skcipher_alg aes_algs[] = { {
|
||||||
|
.base.cra_ctxsize = sizeof(struct aesbs_xts_ctx),
|
||||||
|
.base.cra_module = THIS_MODULE,
|
||||||
|
.base.cra_flags = CRYPTO_ALG_INTERNAL,
|
||||||
|
+ .base.cra_init = xts_init,
|
||||||
|
+ .base.cra_exit = xts_exit,
|
||||||
|
|
||||||
|
.min_keysize = 2 * AES_MIN_KEY_SIZE,
|
||||||
|
.max_keysize = 2 * AES_MAX_KEY_SIZE,
|
||||||
|
@@ -402,5 +432,5 @@ unregister_simds:
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
-module_init(aes_init);
|
||||||
|
+late_initcall(aes_init);
|
||||||
|
module_exit(aes_exit);
|
||||||
|
--
|
||||||
|
cgit v1.1
|
||||||
Loading…
Add table
Reference in a new issue