Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28856a9e authored by Stephan Mueller's avatar Stephan Mueller Committed by Herbert Xu
Browse files

crypto: xts - consolidate sanity check for keys 



The patch centralizes the XTS key check logic into the service function
xts_check_key which is invoked from the different XTS implementations.
With this, the XTS implementations in ARM, ARM64, PPC and S390 have now
a sanity check for the XTS keys similar to the other arches.

In addition, this service function received a check to ensure that the
key != the tweak key which is mandated by FIPS 140-2 IG A.9. As the
check is not present in the standards defining XTS, it is only enforced
in FIPS mode of the kernel.

Signed-off-by: default avatarStephan Mueller <smueller@chronox.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 730d02e2

arch/arm/crypto/aes-ce-glue.c

+4 −0
Original line number Diff line number Diff line
@@ -152,6 +152,10 @@ static int xts_set_key(struct crypto_tfm *tfm, const u8 *in_key, 
	struct crypto_aes_xts_ctx *ctx = crypto_tfm_ctx(tfm);

	int ret;



	ret = xts_check_key(tfm, in_key, key_len);

	if (ret)

		return ret;



	ret = ce_aes_expandkey(&ctx->key1, in_key, key_len / 2);

	if (!ret)

		ret = ce_aes_expandkey(&ctx->key2, &in_key[key_len / 2],

arch/arm/crypto/aesbs-glue.c

+5 −0
Original line number Diff line number Diff line
@@ -89,6 +89,11 @@ static int aesbs_xts_set_key(struct crypto_tfm *tfm, const u8 *in_key, 
{

	struct aesbs_xts_ctx *ctx = crypto_tfm_ctx(tfm);

	int bits = key_len * 4;

	int err;



	err = xts_check_key(tfm, in_key, key_len);

	if (err)

		return err;



	if (private_AES_set_encrypt_key(in_key, bits, &ctx->enc.rk)) {

		tfm->crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;

arch/arm64/crypto/aes-glue.c

+4 −0
Original line number Diff line number Diff line
@@ -85,6 +85,10 @@ static int xts_set_key(struct crypto_tfm *tfm, const u8 *in_key, 
	struct crypto_aes_xts_ctx *ctx = crypto_tfm_ctx(tfm);

	int ret;



	ret = xts_check_key(tfm, in_key, key_len);

	if (ret)

		return ret;



	ret = aes_expandkey(&ctx->key1, in_key, key_len / 2);

	if (!ret)

		ret = aes_expandkey(&ctx->key2, &in_key[key_len / 2],

arch/powerpc/crypto/aes-spe-glue.c

+5 −0
Original line number Diff line number Diff line
@@ -126,6 +126,11 @@ static int ppc_xts_setkey(struct crypto_tfm *tfm, const u8 *in_key, 
		   unsigned int key_len)

{

	struct ppc_xts_ctx *ctx = crypto_tfm_ctx(tfm);

	int err;



	err = xts_check_key(tfm, in_key, key_len);

	if (err)

		return err;



	key_len >>= 1;

arch/s390/crypto/aes_s390.c

+5 −0
Original line number Diff line number Diff line
@@ -587,6 +587,11 @@ static int xts_aes_set_key(struct crypto_tfm *tfm, const u8 *in_key, 
{

	struct s390_xts_ctx *xts_ctx = crypto_tfm_ctx(tfm);

	u32 *flags = &tfm->crt_flags;

	int err;



	err = xts_check_key(tfm, in_key, key_len);

	if (err)

		return err;



	switch (key_len) {

	case 32: