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

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

crypto: talitos - Simplify key parsing 



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

Cc: Kim Phillips <kim.phillips@freescale.com>
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 ab827fb3

drivers/crypto/talitos.c

+8 −27
Original line number Diff line number Diff line
@@ -671,39 +671,20 @@ static int aead_setkey(struct crypto_aead *authenc, 
		       const u8 *key, unsigned int keylen)

{

	struct talitos_ctx *ctx = crypto_aead_ctx(authenc);

	struct rtattr *rta = (void *)key;

	struct crypto_authenc_key_param *param;

	unsigned int authkeylen;

	unsigned int enckeylen;



	if (!RTA_OK(rta, keylen))

		goto badkey;

	struct crypto_authenc_keys keys;



	if (rta->rta_type != CRYPTO_AUTHENC_KEYA_PARAM)

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

		goto badkey;



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

	if (keys.authkeylen + keys.enckeylen > TALITOS_MAX_KEY_SIZE)

		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;

	memcpy(ctx->key, keys.authkey, keys.authkeylen);

	memcpy(&ctx->key[keys.authkeylen], keys.enckey, keys.enckeylen);



	authkeylen = keylen - enckeylen;



	if (keylen > TALITOS_MAX_KEY_SIZE)

		goto badkey;



	memcpy(&ctx->key, key, keylen);



	ctx->keylen = keylen;

	ctx->enckeylen = enckeylen;

	ctx->authkeylen = authkeylen;

	ctx->keylen = keys.authkeylen + keys.enckeylen;

	ctx->enckeylen = keys.enckeylen;

	ctx->authkeylen = keys.authkeylen;



	return 0;