Commit 0ee43367 authored by Vladis Dronov's avatar Vladis Dronov Committed by Herbert Xu
Browse files

crypto: xts - drop xts_check_key() 



xts_check_key() is obsoleted by xts_verify_key(). Over time XTS crypto
drivers adopted the newer xts_verify_key() variant, but xts_check_key()
is still used by a number of drivers. Switch drivers to use the newer
xts_verify_key() and make a couple of cleanups. This allows us to drop
xts_check_key() completely and avoid redundancy.

Signed-off-by: default avatarVladis Dronov <vdronov@redhat.com>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarNicolai Stange <nstange@suse.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 1c4428b2

arch/s390/crypto/paes_s390.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static int xts_paes_set_key(struct crypto_skcipher *tfm, const u8 *in_key, 
		return rc;



	/*

	 * xts_check_key verifies the key length is not odd and makes

	 * xts_verify_key verifies the key length is not odd and makes

	 * sure that the two keys are not the same. This can be done

	 * on the two protected keys as well

	 */

drivers/crypto/atmel-aes.c

+1 −1
Original line number Diff line number Diff line
@@ -1879,7 +1879,7 @@ static int atmel_aes_xts_setkey(struct crypto_skcipher *tfm, const u8 *key, 
	struct atmel_aes_xts_ctx *ctx = crypto_skcipher_ctx(tfm);

	int err;



	err = xts_check_key(crypto_skcipher_tfm(tfm), key, keylen);

	err = xts_verify_key(tfm, key, keylen);

	if (err)

		return err;

drivers/crypto/axis/artpec6_crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -1621,7 +1621,7 @@ artpec6_crypto_xts_set_key(struct crypto_skcipher *cipher, const u8 *key, 
		crypto_skcipher_ctx(cipher);

	int ret;



	ret = xts_check_key(&cipher->base, key, keylen);

	ret = xts_verify_key(cipher, key, keylen);

	if (ret)

		return ret;

drivers/crypto/cavium/cpt/cptvf_algs.c

+3 −5
Original line number Diff line number Diff line
@@ -232,13 +232,12 @@ static int cvm_decrypt(struct skcipher_request *req) 
static int cvm_xts_setkey(struct crypto_skcipher *cipher, const u8 *key,

		   u32 keylen)

{

	struct crypto_tfm *tfm = crypto_skcipher_tfm(cipher);

	struct cvm_enc_ctx *ctx = crypto_tfm_ctx(tfm);

	struct cvm_enc_ctx *ctx = crypto_skcipher_ctx(cipher);

	int err;

	const u8 *key1 = key;

	const u8 *key2 = key + (keylen / 2);



	err = xts_check_key(tfm, key, keylen);

	err = xts_verify_key(cipher, key, keylen);

	if (err)

		return err;

	ctx->key_len = keylen;
@@ -289,8 +288,7 @@ static int cvm_validate_keylen(struct cvm_enc_ctx *ctx, u32 keylen) 
static int cvm_setkey(struct crypto_skcipher *cipher, const u8 *key,

		      u32 keylen, u8 cipher_type)

{

	struct crypto_tfm *tfm = crypto_skcipher_tfm(cipher);

	struct cvm_enc_ctx *ctx = crypto_tfm_ctx(tfm);

	struct cvm_enc_ctx *ctx = crypto_skcipher_ctx(cipher);



	ctx->cipher_type = cipher_type;

	if (!cvm_validate_keylen(ctx, keylen)) {

drivers/crypto/cavium/nitrox/nitrox_skcipher.c

+3 −5
Original line number Diff line number Diff line
@@ -337,12 +337,11 @@ static int nitrox_3des_decrypt(struct skcipher_request *skreq) 
static int nitrox_aes_xts_setkey(struct crypto_skcipher *cipher,

				 const u8 *key, unsigned int keylen)

{

	struct crypto_tfm *tfm = crypto_skcipher_tfm(cipher);

	struct nitrox_crypto_ctx *nctx = crypto_tfm_ctx(tfm);

	struct nitrox_crypto_ctx *nctx = crypto_skcipher_ctx(cipher);

	struct flexi_crypto_context *fctx;

	int aes_keylen, ret;



	ret = xts_check_key(tfm, key, keylen);

	ret = xts_verify_key(cipher, key, keylen);

	if (ret)

		return ret;
@@ -362,8 +361,7 @@ static int nitrox_aes_xts_setkey(struct crypto_skcipher *cipher, 
static int nitrox_aes_ctr_rfc3686_setkey(struct crypto_skcipher *cipher,

					 const u8 *key, unsigned int keylen)

{

	struct crypto_tfm *tfm = crypto_skcipher_tfm(cipher);

	struct nitrox_crypto_ctx *nctx = crypto_tfm_ctx(tfm);

	struct nitrox_crypto_ctx *nctx = crypto_skcipher_ctx(cipher);

	struct flexi_crypto_context *fctx;

	int aes_keylen;