diff options
| author | Ravi Nagarajan <nravi@broadcom.com> | 2012-05-02 17:21:37 +0530 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2012-07-14 11:19:19 -0700 |
| commit | defb69c3b383ad0f9b5d6329be625fafc2e3c931 (patch) | |
| tree | 1d13985bb9ca12b943aa70474a9a42243e6040a4 /stack | |
| parent | cff2b2b29bd9083f0b92e628b225a72a7ef52332 (diff) | |
| download | external_bluetooth_bluedroid-defb69c3b383ad0f9b5d6329be625fafc2e3c931.zip external_bluetooth_bluedroid-defb69c3b383ad0f9b5d6329be625fafc2e3c931.tar.gz external_bluetooth_bluedroid-defb69c3b383ad0f9b5d6329be625fafc2e3c931.tar.bz2 | |
Resolve JustWorks related pairing issues
1. Per the spec, if both sides are using "No Bonding" for auth requirements, then the key could be considered a session key. Updated the pairing logic to handle this
2. If incoming JustWorks pairing is initiated, prompt the user for consent if the peer's io capabilities reflects DisplayOnly or NoInputNoOutput
Change-Id: If592c96203e7a4b25af3d87056d534131b606e58
Diffstat (limited to 'stack')
| -rwxr-xr-x | stack/btm/btm_sec.c | 2 | ||||
| -rw-r--r-- | stack/include/btm_api.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/stack/btm/btm_sec.c b/stack/btm/btm_sec.c index a845acc..80cb99f 100755 --- a/stack/btm/btm_sec.c +++ b/stack/btm/btm_sec.c @@ -3305,6 +3305,8 @@ void btm_proc_sp_req_evt (tBTM_SP_EVT event, UINT8 *p) evt_data.cfm_req.loc_auth_req = btm_cb.devcb.loc_auth_req; evt_data.cfm_req.rmt_auth_req = p_dev_rec->rmt_auth_req; + evt_data.cfm_req.loc_io_caps = btm_cb.devcb.loc_io_caps; + evt_data.cfm_req.rmt_io_caps = p_dev_rec->rmt_io_caps; break; case BTM_SP_KEY_NOTIF_EVT: diff --git a/stack/include/btm_api.h b/stack/include/btm_api.h index e27fcb1..76b6e03 100644 --- a/stack/include/btm_api.h +++ b/stack/include/btm_api.h @@ -1412,6 +1412,8 @@ typedef struct BOOLEAN just_works; /* TRUE, if "Just Works" association model */ tBTM_AUTH_REQ loc_auth_req; /* Authentication required for local device */ tBTM_AUTH_REQ rmt_auth_req; /* Authentication required for peer device */ + tBTM_IO_CAP loc_io_caps; /* IO Capabilities of the local device */ + tBTM_IO_CAP rmt_io_caps; /* IO Capabilities of the remot device */ } tBTM_SP_CFM_REQ; /* data type for BTM_SP_KEY_REQ_EVT */ |