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

Commit 894b68d8 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: hisilicon/des - switch to new verification routines 



Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent f4ed6860

drivers/crypto/hisilicon/sec/sec_algs.c

+7 −11
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


#include <crypto/aes.h>

#include <crypto/algapi.h>

#include <crypto/des.h>

#include <crypto/internal/des.h>

#include <crypto/skcipher.h>

#include <crypto/xts.h>

#include <crypto/internal/skcipher.h>
@@ -347,25 +347,21 @@ static int sec_alg_skcipher_setkey_aes_xts(struct crypto_skcipher *tfm, 
static int sec_alg_skcipher_setkey_des_ecb(struct crypto_skcipher *tfm,

					   const u8 *key, unsigned int keylen)

{

	if (keylen != DES_KEY_SIZE)

		return -EINVAL;



	return sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_ECB_64);

	return verify_skcipher_des_key(tfm, key) ?:

	       sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_ECB_64);

}



static int sec_alg_skcipher_setkey_des_cbc(struct crypto_skcipher *tfm,

					   const u8 *key, unsigned int keylen)

{

	if (keylen != DES_KEY_SIZE)

		return -EINVAL;



	return sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_CBC_64);

	return verify_skcipher_des_key(tfm, key) ?:

	       sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_CBC_64);

}



static int sec_alg_skcipher_setkey_3des_ecb(struct crypto_skcipher *tfm,

					    const u8 *key, unsigned int keylen)

{

	return unlikely(des3_verify_key(tfm, key)) ?:

	return verify_skcipher_des3_key(tfm, key) ?:

	       sec_alg_skcipher_setkey(tfm, key, keylen,

				       SEC_C_3DES_ECB_192_3KEY);

}
@@ -373,7 +369,7 @@ static int sec_alg_skcipher_setkey_3des_ecb(struct crypto_skcipher *tfm, 
static int sec_alg_skcipher_setkey_3des_cbc(struct crypto_skcipher *tfm,

					    const u8 *key, unsigned int keylen)

{

	return unlikely(des3_verify_key(tfm, key)) ?:

	return verify_skcipher_des3_key(tfm, key) ?:

	       sec_alg_skcipher_setkey(tfm, key, keylen,

				       SEC_C_3DES_CBC_192_3KEY);

}