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

Commit 201a5929 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Remove dead code from SMP encryption function 



The AES cipher is used in ECB mode by SMP and therefore doesn't use an
IV (crypto_blkcipher_ivsize returns 0) so the code trying to set the IV
was never getting called. Simply remove this code to avoid anyone from
thinking it actually makes some difference.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent e84a6b13

net/bluetooth/smp.c

+1 −8
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ static int smp_e(struct crypto_blkcipher *tfm, const u8 *k, u8 *r) 
{

	struct blkcipher_desc desc;

	struct scatterlist sg;

	int err, iv_len;

	unsigned char iv[128];

	int err;



	if (tfm == NULL) {

		BT_ERR("tfm %p", tfm);
@@ -72,12 +71,6 @@ static int smp_e(struct crypto_blkcipher *tfm, const u8 *k, u8 *r) 


	sg_init_one(&sg, r, 16);



	iv_len = crypto_blkcipher_ivsize(tfm);

	if (iv_len) {

		memset(&iv, 0xff, iv_len);

		crypto_blkcipher_set_iv(tfm, iv, iv_len);

	}



	err = crypto_blkcipher_encrypt(&desc, &sg, &sg, 16);

	if (err)

		BT_ERR("Encrypt data error %d", err);