diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2013-12-02 10:49:04 +0200 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-12-04 11:09:05 -0200 |
| commit | 201a5929c8c788f9ef53b010065c9ce70c9c06f0 (patch) | |
| tree | 94909a7924645c50f37e6ceba9ea1234f93b7d90 /net | |
| parent | e84a6b139bdd3af2914f194ff840b1a36fa55598 (diff) | |
| download | op-kernel-dev-201a5929c8c788f9ef53b010065c9ce70c9c06f0.zip op-kernel-dev-201a5929c8c788f9ef53b010065c9ce70c9c06f0.tar.gz | |
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: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/smp.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 3bcb765..e61e74a 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -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); |
