diff options
| author | Szymon Janc <szymon.janc@codecoup.pl> | 2016-10-20 22:14:49 +0200 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2016-10-21 11:05:28 +0300 |
| commit | 06be53208f7dcf78bc74bdb88614001f067c4b49 (patch) | |
| tree | d34fe005d025c8add729175fa10ab8495325de74 | |
| parent | a4695fe19cca9b746cb4d34bfcce75ca35fcc3c9 (diff) | |
| download | bluez-06be53208f7dcf78bc74bdb88614001f067c4b49.tar.gz | |
shared/att: Fix handling 'Insufficent Authentication' error respone
>From Core Specification 4.2 Vol.3 Part C (page 375):
When the link is not encrypted, the error code "Insufficient
Authentication" does not indicate that MITM protection is required.
When unauthenticated pairing has occurred and the link is currently
encrypted, the error code "Insufficient Authentication" indicates that
MITM protection is required.
If LE Secure Connections authenticated pairing is required but LE
legacy pairing has occurred and the link is currently encrypted, the
service request shall be rejected with the error code "Insufficient
Authentication".
| -rw-r--r-- | src/shared/att.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/shared/att.c b/src/shared/att.c index f1e0f5922..3071b51b8 100644 --- a/src/shared/att.c +++ b/src/shared/att.c @@ -603,13 +603,20 @@ static bool change_security(struct bt_att *att, uint8_t ecode) security = bt_att_get_security(att); if (ecode == BT_ATT_ERROR_INSUFFICIENT_ENCRYPTION && - security < BT_ATT_SECURITY_MEDIUM) + security < BT_ATT_SECURITY_MEDIUM) { security = BT_ATT_SECURITY_MEDIUM; - else if (ecode == BT_ATT_ERROR_AUTHENTICATION && - security < BT_ATT_SECURITY_HIGH) - security = BT_ATT_SECURITY_HIGH; - else + } else if (ecode == BT_ATT_ERROR_AUTHENTICATION) { + if (security < BT_ATT_SECURITY_MEDIUM) + security = BT_ATT_SECURITY_MEDIUM; + else if (security < BT_ATT_SECURITY_HIGH) + security = BT_ATT_SECURITY_HIGH; + else if (security < BT_ATT_SECURITY_FIPS) + security = BT_ATT_SECURITY_FIPS; + else + return false; + } else { return false; + } return bt_att_set_security(att, security); } |