kernel/include/net/bluetooth/smp.h, branch linux-rolling-stable

Bluetooth: Move smp.h header file into net/bluetooth/

2013-10-10T22:10:07Z

The smp.h header file is only used internally by the bluetooth.ko module and is not a public API. So make it local to the core Bluetooth module. Signed-off-by: Marcel Holtmann Signed-off-by: Johan Hedberg

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-09-15T15:43:53Z

Conflicts: net/netfilter/nfnetlink_log.c net/netfilter/xt_LOG.c Rather easy conflict resolution, the 'net' tree had bug fixes to make sure we checked if a socket is a time-wait one or not and elide the logging code if so. Whereas on the 'net-next' side we are calculating the UID and GID from the creds using different interfaces due to the user namespace changes from Eric Biederman. Signed-off-by: David S. Miller

Bluetooth: Change signature of smp_conn_security()

2012-08-27T15:07:18Z

To make it clear that it may be called from contexts that may not have any knowledge of L2CAP, we change the connection parameter, to receive a hci_conn. This also makes it clear that it is checking the security of the link. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo Padovan

Bluetooth: trivial: Fix mixing spaces and tabs in smp

2012-08-06T18:02:55Z

Change spaces to tabs in smp code Signed-off-by: Andrei Emeltchenko Signed-off-by: Gustavo Padovan

Bluetooth: Correct ediv in SMP

2012-05-09T03:41:30Z

ediv is already in little endian order. Signed-off-by: Andrei Emeltchenko Acked-by: Marcel Holtmann Signed-off-by: Johan Hedberg

Bluetooth: Rename smp_key_size to enc_key_size

2012-02-13T15:01:30Z

This makes clear that this is the size of the key used to encrypt the link. Signed-off-by: Vinicius Costa Gomes Acked-by: Marcel Holtmann Signed-off-by: Johan Hedberg

Bluetooth: Add MITM mechanism to LE-SMP

2011-12-22T16:18:59Z

To achive Man-In-The-Middle (MITM) level security with Low Energy, we have to enable User Passkey Comparison. This commit modifies the hard-coded JUST-WORKS pairing mechanism to support query via the MGMT interface of Passkey comparison and User Confirmation. Signed-off-by: Brian Gix Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan

Bluetooth: Move SMP crypto functions to a workqueue

2011-09-21T15:58:12Z

The function crypto_blkcipher_setkey() called by smp_e() can sleep, so all the crypto work has to be moved to hci_dev workqueue. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan

Bluetooth: Move SMP fields to a separate structure

2011-09-21T15:58:12Z

The objective is to make the core to have as little as possible information about SMP procedures and logic. Now, all the SMP specific information is hidden from the core. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan

Bluetooth: Add support for SMP phase 3 (key distribution)

2011-07-08T20:07:43Z

This adds support for generating and distributing all the keys specified in the third phase of SMP. This will make possible to re-establish secure connections, resolve private addresses and sign commands. For now, the values generated are random. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan