Linux kernel: updates to meet all extended test requirements

The following tests are not (yet) successful from the Linux
extended test harness:

- XTS fails as testing uses multiple SGLs - as outlined in the code
  only one SGL is supported

- ChaCha20: testing uses fancy input data which is rejected by
  leancrypto with -EINVAL.

- ChaCha20-Poly1305:  testing uses fancy input data which is rejected by
  leancrypto with -EINVAL.

Signed-off-by: Stephan Mueller <smueller@chronox.de>

Author: smuellerDD

aead/src/gcm.c

@@ -45,6 +45,7 @@
 *******************************************************************************/
 
 #include "aes_c.h"
+#include "../../sym/src/aes_internal.h"
 #include "alignment.h"
 #include "bitshift_be.h"
 #include "compare.h"
@@ -327,6 +328,10 @@ static int gcm_setkey(struct lc_aes_gcm_cryptor *ctx, const uint8_t *key,
 	 */
 	CKNULL(key, 0);
 
+	ret = aes_check_keylen(keylen);
+	if (ret)
+		return ret;
+
 	memset(h, 0, AES_BLOCKSIZE); /* initialize the block to encrypt */
 
 	/*

aead/tests/leancrypto_kernel_chacha20_poly1305_tester.c

@@ -392,7 +392,7 @@ static int rfc7539_cc20p1305_tester(void)
 					   0xe2, 0x6a, 0x7e, 0x90, 0x2e, 0xcb,
 					   0xd0, 0x60, 0x06, 0x91 };
 	pr_info("ChaCha20 Poly1305 crypt\n");
-	return lc_aead_test("chacha20-rfc7539-poly1305-leancrypto", pt,
+	return lc_aead_test("rfc7539-chacha20-poly1305-leancrypto", pt,
 			    sizeof(pt), iv, sizeof(iv), aad, sizeof(aad), key,
 			    sizeof(key), exp_ct, exp_tag, sizeof(exp_tag), 0);
 }
@@ -475,7 +475,7 @@ static int rfc7539esp_cc20p1305_tester(void)
 					   0xe2, 0x6a, 0x7e, 0x90, 0x2e, 0xcb,
 					   0xd0, 0x60, 0x06, 0x91 };
 	pr_info("ESP ChaCha20 Poly1305 crypt\n");
-	return lc_aead_test("chacha20-rfc7539esp-poly1305-leancrypto", pt,
+	return lc_aead_test("rfc7539esp-chacha20-poly1305-leancrypto", pt,
 			    sizeof(pt), iv, sizeof(iv), aad, sizeof(aad), key,
 			    sizeof(key), exp_ct, exp_tag, sizeof(exp_tag), 1);
 }

linux_kernel/Kbuild.basics

@@ -1,13 +1,4 @@
-################################################################################
-# Anchor to compile the leancrypto kernel support.
-#
-# When compiling leancrypto as a kernel module either in-tree or out-of-tree
-# use `obj-m`.
-#
-# When compiling leancrypto statically bound into the Linux kernel binary
-# from inside the Linux kernel tree, use `obj-y`.
-#
-obj-m				:= leancrypto.o
+obj-$(CONFIG_LEANCRYPTO)	:= leancrypto.o
 
 # Kernel module framework
 ccflags-y			+= -DLINUX_KERNEL

linux_kernel/Kbuild.config

@@ -9,6 +9,16 @@
 
 ############################## Basic Configuration #############################
 
+#
+# Enable Leancrypto compilation
+# Dependencies: N/A
+# The option can either be either 'y' for static linking into the Linux kernel
+# (only applicable when compiling as part of the Linux kernel compilation) or
+# 'm' for compiling as a kernel module.
+#
+
+CONFIG_LEANCRYPTO=m
+
 #
 # Enable test kernel modules to be built
 # Dependencies: N/A

linux_kernel/README.md

@@ -39,8 +39,8 @@ the following steps have to be taken:
 	`obj-y += leancrypto/linux_kernel/`
 
 3. tell leancrypto to be compiled statically into the kernel by editing the file
-   `leancrypto/linux_kernel/Kbuild.basics` and modifying the very first line
-   to change `obj-m` to `obj-y`.
+   `leancrypto/linux_kernel/Kbuild.config` and modify the option 
+   `CONFIG_LEANCRYPTO` to `y`.
 
 At this point, leancrypto will now be built statically into the Linux kernel
 when compiling it. Naturally, all Linux kernel options can be set as leancrypto

linux_kernel/leancrypto_kernel_aes_cbc.c

@@ -80,7 +80,10 @@ static int lc_aes_cbc_common(struct skcipher_request *req,
 		err = skcipher_walk_done(&walk, walk.nbytes - nbytes);
 	}
 
-	return err;
+	if (err)
+		return err;
+
+	return lc_sym_getiv(ctx, req->iv, AES_BLOCK_SIZE);
 }
 
 static int lc_aes_cbc_encrypt(struct skcipher_request *req)

linux_kernel/leancrypto_kernel_aes_ctr.c

@@ -77,7 +77,10 @@ static int lc_aes_ctr_common(struct skcipher_request *req,
 		err = skcipher_walk_done(&walk, walk.nbytes - nbytes);
 	}
 
-	return err;
+	if (err)
+		return err;
+
+	return lc_sym_getiv(ctx, req->iv, AES_BLOCK_SIZE);
 }
 
 static int lc_aes_ctr_encrypt(struct skcipher_request *req)

linux_kernel/leancrypto_kernel_aes_xts.c

@@ -153,7 +153,7 @@ static int lc_aes_xts_common(struct skcipher_request *req,
 		   req->dst->length >= req->cryptlen)) {
 		crypt_func(ctx, sg_virt(req->src), sg_virt(req->dst),
 			   req->cryptlen);
-		return 0;
+		return lc_sym_getiv(ctx, req->iv, AES_BLOCK_SIZE);
 	}
 
 	return lc_aes_xts_slowpath(req, crypt_func);

linux_kernel/leancrypto_kernel_chacha20_poly1305.c

@@ -253,8 +253,8 @@ static void lc_cc20p1305_exit(struct crypto_aead *aead)
 static struct aead_alg lc_cc20p1305_algs[] = {
 	{
 		.base = {
-			.cra_name = "chacha20(rfc7539,poly1305)",
-			.cra_driver_name = "chacha20-rfc7539-poly1305-leancrypto",
+			.cra_name = "rfc7539(chacha20,poly1305)",
+			.cra_driver_name = "rfc7539-chacha20-poly1305-leancrypto",
 			.cra_priority = LC_KERNEL_DEFAULT_PRIO,
 			.cra_blocksize = 1,
 			.cra_ctxsize = sizeof(struct lc_rfc7539_cc20p1305_ctx),
@@ -271,8 +271,8 @@ static struct aead_alg lc_cc20p1305_algs[] = {
 		.maxauthsize = POLY1305_DIGEST_SIZE,
 	}, {
 		.base = {
-			.cra_name = "chacha20(rfc7539esp,poly1305)",
-			.cra_driver_name = "chacha20-rfc7539esp-poly1305-leancrypto",
+			.cra_name = "rfc7539esp(chacha20,poly1305)",
+			.cra_driver_name = "rfc7539esp-chacha20-poly1305-leancrypto",
 			.cra_priority = LC_KERNEL_DEFAULT_PRIO,
 			.cra_blocksize = 1,
 			.cra_ctxsize = sizeof(struct lc_rfc7539_cc20p1305_ctx),

linux_kernel/leancrypto_kernel_sha3.c

@@ -85,7 +85,6 @@ static struct shash_alg lc_sha3_algs[] = {
 		.update = lc_kernel_sha3_update,
 		.final = lc_kernel_sha3_final,
 		.descsize = LC_SHA3_STATE_SIZE_ALIGN(LC_SHA3_224_CTX_SIZE),
-		.statesize = LC_SHA3_STATE_SIZE,
 		.base.cra_name = "sha3-224",
 		.base.cra_driver_name = "sha3-224-leancrypto",
 		.base.cra_blocksize = LC_SHA3_224_SIZE_BLOCK,
@@ -98,7 +97,6 @@ static struct shash_alg lc_sha3_algs[] = {
 		.update = lc_kernel_sha3_update,
 		.final = lc_kernel_sha3_final,
 		.descsize = LC_SHA3_STATE_SIZE_ALIGN(LC_SHA3_256_CTX_SIZE),
-		.statesize = LC_SHA3_STATE_SIZE,
 		.base.cra_name = "sha3-256",
 		.base.cra_driver_name = "sha3-256-leancrypto",
 		.base.cra_blocksize = LC_SHA3_256_SIZE_BLOCK,
@@ -111,7 +109,6 @@ static struct shash_alg lc_sha3_algs[] = {
 		.update = lc_kernel_sha3_update,
 		.final = lc_kernel_sha3_final,
 		.descsize = LC_SHA3_STATE_SIZE_ALIGN(LC_SHA3_384_CTX_SIZE),
-		.statesize = LC_SHA3_STATE_SIZE,
 		.base.cra_name = "sha3-384",
 		.base.cra_driver_name = "sha3-384-leancrypto",
 		.base.cra_blocksize = LC_SHA3_384_SIZE_BLOCK,
@@ -124,7 +121,6 @@ static struct shash_alg lc_sha3_algs[] = {
 		.update = lc_kernel_sha3_update,
 		.final = lc_kernel_sha3_final,
 		.descsize = LC_SHA3_STATE_SIZE_ALIGN(LC_SHA3_512_CTX_SIZE),
-		.statesize = LC_SHA3_STATE_SIZE,
 		.base.cra_name = "sha3-512",
 		.base.cra_driver_name = "sha3-512-leancrypto",
 		.base.cra_blocksize = LC_SHA3_512_SIZE_BLOCK,