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

Commit fddc2c43 authored by Mathias Krause's avatar Mathias Krause Committed by Herbert Xu
Browse files

crypto: authencesn - Simplify key parsing 



Use the common helper function crypto_authenc_extractkeys() for key
parsing.

Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarMathias Krause <mathias.krause@secunet.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent bc6e2bdb

crypto/authencesn.c

+4 −22
Original line number Diff line number Diff line
@@ -59,37 +59,19 @@ static void authenc_esn_request_complete(struct aead_request *req, int err) 
static int crypto_authenc_esn_setkey(struct crypto_aead *authenc_esn, const u8 *key,

				     unsigned int keylen)

{

	unsigned int authkeylen;

	unsigned int enckeylen;

	struct crypto_authenc_esn_ctx *ctx = crypto_aead_ctx(authenc_esn);

	struct crypto_ahash *auth = ctx->auth;

	struct crypto_ablkcipher *enc = ctx->enc;

	struct rtattr *rta = (void *)key;

	struct crypto_authenc_key_param *param;

	struct crypto_authenc_keys keys;

	int err = -EINVAL;



	if (!RTA_OK(rta, keylen))

	if (crypto_authenc_extractkeys(&keys, key, keylen) != 0)

		goto badkey;

	if (rta->rta_type != CRYPTO_AUTHENC_KEYA_PARAM)

		goto badkey;

	if (RTA_PAYLOAD(rta) < sizeof(*param))

		goto badkey;



	param = RTA_DATA(rta);

	enckeylen = be32_to_cpu(param->enckeylen);



	key += RTA_ALIGN(rta->rta_len);

	keylen -= RTA_ALIGN(rta->rta_len);



	if (keylen < enckeylen)

		goto badkey;



	authkeylen = keylen - enckeylen;



	crypto_ahash_clear_flags(auth, CRYPTO_TFM_REQ_MASK);

	crypto_ahash_set_flags(auth, crypto_aead_get_flags(authenc_esn) &

				     CRYPTO_TFM_REQ_MASK);

	err = crypto_ahash_setkey(auth, key, authkeylen);

	err = crypto_ahash_setkey(auth, keys.authkey, keys.authkeylen);

	crypto_aead_set_flags(authenc_esn, crypto_ahash_get_flags(auth) &

					   CRYPTO_TFM_RES_MASK);
@@ -99,7 +81,7 @@ static int crypto_authenc_esn_setkey(struct crypto_aead *authenc_esn, const u8 * 
	crypto_ablkcipher_clear_flags(enc, CRYPTO_TFM_REQ_MASK);

	crypto_ablkcipher_set_flags(enc, crypto_aead_get_flags(authenc_esn) &

					 CRYPTO_TFM_REQ_MASK);

	err = crypto_ablkcipher_setkey(enc, key + authkeylen, enckeylen);

	err = crypto_ablkcipher_setkey(enc, keys.enckey, keys.enckeylen);

	crypto_aead_set_flags(authenc_esn, crypto_ablkcipher_get_flags(enc) &

					   CRYPTO_TFM_RES_MASK);