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

Commit 787a183b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "crypto: msm: Fix key length setting"

parents e804f4fe 83c570e1

drivers/crypto/msm/qce50.c

+2 −3
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int _ce_setup_hash(struct qce_device *pce_dev, 
	struct sps_command_element *pce = NULL;

	bool use_hw_key = false;

	bool use_pipe_key = false;

	uint32_t authk_size_in_word = SHA_HMAC_KEY_SIZE/sizeof(uint32_t);

	uint32_t authk_size_in_word = sreq->authklen/sizeof(uint32_t);

	uint32_t auth_cfg;



	if ((sreq->alg == QCE_HASH_SHA1_HMAC) ||
@@ -1052,8 +1052,7 @@ static int _ce_setup_hash_direct(struct qce_device *pce_dev, 
	int i;

	uint32_t mackey32[SHA_HMAC_KEY_SIZE/sizeof(uint32_t)] = {

			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};

	uint32_t authk_size_in_word =

			SHA_HMAC_KEY_SIZE/sizeof(uint32_t);

	uint32_t authk_size_in_word = sreq->authklen/sizeof(uint32_t);

	bool sha1 = false;

	uint32_t auth_cfg = 0;