michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: SMP: Factor out BR/EDR encryption check to helper

Browse source 
This make it easier to follow code flow in #ifdefs blocks.

Change-Id: I06941b9db2a76ea587bae02a3bfbc40abf7f2779
Signed-off-by: Szymon Janc <ext.szymon.janc@tieto.com>
This commit is contained in:
Szymon Janc 2016-09-14 11:24:31 +02:00
commit c320abc72c
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
net/bluetooth/smp.c
View file

@ -869,6 +869,22 @@ static void smp_br_distribute_keys(struct bt_smp *smp)
#endif /* CONFIG_BLUETOOTH_SIGNING */
}
static bool smp_br_pairing_allowed(struct bt_smp *smp)
{
if (smp->chan.chan.conn->encrypt == 0x02) {
return true;
}
#if defined(CONFIG_BLUETOOTH_SMP_FORCE_BREDR)
if (smp->chan.chan.conn->encrypt == 0x01) {
BT_WARN("Allowing BR/EDR SMP with P-192 key");
return true;
}
#endif
return false;
}
static uint8_t smp_br_pairing_req(struct bt_smp *smp, struct net_buf *buf)
{
struct bt_smp_pairing *req = (void *)buf->data;
@ -886,16 +902,9 @@ static uint8_t smp_br_pairing_req(struct bt_smp *smp, struct net_buf *buf)
* using P256, a Pairing Failed shall be sent with the error code
* "Cross-transport Key Derivation/Generation not allowed" (0x0E)."
*/
if (smp->chan.chan.conn->encrypt != 0x02) {
#if defined(CONFIG_BLUETOOTH_SMP_FORCE_BREDR)
if (!smp->chan.chan.conn->encrypt) {
if (!smp_br_pairing_allowed(smp)) {
return BT_SMP_ERR_CROSS_TRANSP_NOT_ALLOWED;
}
BT_WARN("Allowing BR/EDR SMP with P-192 key");
#else
return BT_SMP_ERR_CROSS_TRANSP_NOT_ALLOWED;
#endif /*CONFIG_BLUETOOTH_SMP_FORCE_BREDR*/
}
max_key_size = bt_conn_enc_key_size(conn);
if (!max_key_size) {