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

Commit 03b56ce5 authored by Jarod Wilson's avatar Jarod Wilson Committed by Herbert Xu
Browse files

crypto: des_s390 - Permit weak keys unless REQ_WEAK_KEY set 



Just started running fips cavs test vectors through an s390x system
for giggles, and discovered that I missed patching s390's arch-specific
des3 implementation w/an earlier des3 patch to permit weak keys.

This change adds the same flag tweaks as
ad79cdd7 (crypto: des3_ede - permit
weak keys unless REQ_WEAK_KEY set) for s390's des3 implementation,
yields expected test results now.

Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5b739ef8

arch/s390/crypto/des_s390.c

+6 −5
Original line number Diff line number Diff line
@@ -250,8 +250,9 @@ static int des3_128_setkey(struct crypto_tfm *tfm, const u8 *key, 
	const u8 *temp_key = key;

	u32 *flags = &tfm->crt_flags;



	if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE))) {

		*flags |= CRYPTO_TFM_RES_BAD_KEY_SCHED;

	if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE)) &&

	    (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) {

		*flags |= CRYPTO_TFM_RES_WEAK_KEY;

		return -EINVAL;

	}

	for (i = 0; i < 2; i++, temp_key += DES_KEY_SIZE) {
@@ -411,9 +412,9 @@ static int des3_192_setkey(struct crypto_tfm *tfm, const u8 *key, 


	if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) &&

	    memcmp(&key[DES_KEY_SIZE], &key[DES_KEY_SIZE * 2],

		   DES_KEY_SIZE))) {



		*flags |= CRYPTO_TFM_RES_BAD_KEY_SCHED;

		   DES_KEY_SIZE)) &&

	    (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) {

		*flags |= CRYPTO_TFM_RES_WEAK_KEY;

		return -EINVAL;

	}

	for (i = 0; i < 3; i++, temp_key += DES_KEY_SIZE) {