| Message ID | 20200331132831.443518-1-marcel@holtmann.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Johan Hedberg |
| Headers | show |
| Series | Bluetooth: Add support for Read Local Simple Pairing Options | expand |
Hi Marcel, On Tue, Mar 31, 2020 at 9:28 AM Marcel Holtmann <marcel@holtmann.org> wrote: > > With the Read Local Simple Pairing Options command it is possible to > retrieve the support for max encryption key size supported by the > controller and also if the controller correctly verifies the ECDH public > key during pairing. > > Signed-off-by: Marcel Holtmann <marcel@holtmann.org> > --- > include/net/bluetooth/hci.h | 7 +++++++ > include/net/bluetooth/hci_core.h | 2 ++ > net/bluetooth/hci_core.c | 4 ++++ > net/bluetooth/hci_event.c | 21 +++++++++++++++++++++ > 4 files changed, 34 insertions(+) > > diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h > index 5f60e135aeb6..a495964d5553 100644 > --- a/include/net/bluetooth/hci.h > +++ b/include/net/bluetooth/hci.h > @@ -1272,6 +1272,13 @@ struct hci_rp_read_data_block_size { > > #define HCI_OP_READ_LOCAL_CODECS 0x100b > > +#define HCI_OP_READ_LOCAL_PAIRING_OPTS 0x100c > +struct hci_rp_read_local_pairing_opts { > + __u8 status; > + __u8 pairing_opts; > + __u8 max_key_size; > +} __packed; > + > #define HCI_OP_READ_PAGE_SCAN_ACTIVITY 0x0c1b > struct hci_rp_read_page_scan_activity { > __u8 status; > diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h > index d4e28773d378..228b5021060c 100644 > --- a/include/net/bluetooth/hci_core.h > +++ b/include/net/bluetooth/hci_core.h > @@ -312,6 +312,8 @@ struct hci_dev { > __u16 conn_info_max_age; > __u16 auth_payload_timeout; > __u8 min_enc_key_size; > + __u8 max_enc_key_size; > + __u8 pairing_opts; > __u8 ssp_debug_mode; > __u8 hw_error_code; > __u32 clock; > diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c > index 2e7bc2da8371..331759878b3c 100644 > --- a/net/bluetooth/hci_core.c > +++ b/net/bluetooth/hci_core.c > @@ -826,6 +826,10 @@ static int hci_init4_req(struct hci_request *req, unsigned long opt) > if (hdev->commands[29] & 0x20) > hci_req_add(req, HCI_OP_READ_LOCAL_CODECS, 0, NULL); > > + /* Read local pairing options if the HCI command is supported */ > + if (hdev->commands[41] & 0x08) > + hci_req_add(req, HCI_OP_READ_LOCAL_PAIRING_OPTS, 0, NULL); > + > /* Get MWS transport configuration if the HCI command is supported */ > if (hdev->commands[30] & 0x08) > hci_req_add(req, HCI_OP_GET_MWS_TRANSPORT_CONFIG, 0, NULL); > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > index 0a591be8b0ae..ca7a00e9312a 100644 > --- a/net/bluetooth/hci_event.c > +++ b/net/bluetooth/hci_event.c > @@ -746,6 +746,23 @@ static void hci_cc_read_bd_addr(struct hci_dev *hdev, struct sk_buff *skb) > bacpy(&hdev->setup_addr, &rp->bdaddr); > } > > +static void hci_cc_read_local_pairing_opts(struct hci_dev *hdev, > + struct sk_buff *skb) > +{ > + struct hci_rp_read_local_pairing_opts *rp = (void *) skb->data; > + > + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); > + > + if (rp->status) > + return; > + > + if (hci_dev_test_flag(hdev, HCI_SETUP) || > + hci_dev_test_flag(hdev, HCI_CONFIG)) { > + hdev->pairing_opts = rp->pairing_opts; > + hdev->max_enc_key_size = rp->max_key_size; > + } > +} > + > static void hci_cc_read_page_scan_activity(struct hci_dev *hdev, > struct sk_buff *skb) > { > @@ -3334,6 +3351,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb, > hci_cc_read_bd_addr(hdev, skb); > break; > > + case HCI_OP_READ_LOCAL_PAIRING_OPTS: > + hci_cc_read_local_pairing_opts(hdev, skb); > + break; > + > case HCI_OP_READ_PAGE_SCAN_ACTIVITY: > hci_cc_read_page_scan_activity(hdev, skb); > break; > -- > 2.25.1 > LGTM. Thanks, Alain
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 5f60e135aeb6..a495964d5553 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -1272,6 +1272,13 @@ struct hci_rp_read_data_block_size { #define HCI_OP_READ_LOCAL_CODECS 0x100b +#define HCI_OP_READ_LOCAL_PAIRING_OPTS 0x100c +struct hci_rp_read_local_pairing_opts { + __u8 status; + __u8 pairing_opts; + __u8 max_key_size; +} __packed; + #define HCI_OP_READ_PAGE_SCAN_ACTIVITY 0x0c1b struct hci_rp_read_page_scan_activity { __u8 status; diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index d4e28773d378..228b5021060c 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -312,6 +312,8 @@ struct hci_dev { __u16 conn_info_max_age; __u16 auth_payload_timeout; __u8 min_enc_key_size; + __u8 max_enc_key_size; + __u8 pairing_opts; __u8 ssp_debug_mode; __u8 hw_error_code; __u32 clock; diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 2e7bc2da8371..331759878b3c 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -826,6 +826,10 @@ static int hci_init4_req(struct hci_request *req, unsigned long opt) if (hdev->commands[29] & 0x20) hci_req_add(req, HCI_OP_READ_LOCAL_CODECS, 0, NULL); + /* Read local pairing options if the HCI command is supported */ + if (hdev->commands[41] & 0x08) + hci_req_add(req, HCI_OP_READ_LOCAL_PAIRING_OPTS, 0, NULL); + /* Get MWS transport configuration if the HCI command is supported */ if (hdev->commands[30] & 0x08) hci_req_add(req, HCI_OP_GET_MWS_TRANSPORT_CONFIG, 0, NULL); diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 0a591be8b0ae..ca7a00e9312a 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -746,6 +746,23 @@ static void hci_cc_read_bd_addr(struct hci_dev *hdev, struct sk_buff *skb) bacpy(&hdev->setup_addr, &rp->bdaddr); } +static void hci_cc_read_local_pairing_opts(struct hci_dev *hdev, + struct sk_buff *skb) +{ + struct hci_rp_read_local_pairing_opts *rp = (void *) skb->data; + + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); + + if (rp->status) + return; + + if (hci_dev_test_flag(hdev, HCI_SETUP) || + hci_dev_test_flag(hdev, HCI_CONFIG)) { + hdev->pairing_opts = rp->pairing_opts; + hdev->max_enc_key_size = rp->max_key_size; + } +} + static void hci_cc_read_page_scan_activity(struct hci_dev *hdev, struct sk_buff *skb) { @@ -3334,6 +3351,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb, hci_cc_read_bd_addr(hdev, skb); break; + case HCI_OP_READ_LOCAL_PAIRING_OPTS: + hci_cc_read_local_pairing_opts(hdev, skb); + break; + case HCI_OP_READ_PAGE_SCAN_ACTIVITY: hci_cc_read_page_scan_activity(hdev, skb); break;
With the Read Local Simple Pairing Options command it is possible to retrieve the support for max encryption key size supported by the controller and also if the controller correctly verifies the ECDH public key during pairing. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> --- include/net/bluetooth/hci.h | 7 +++++++ include/net/bluetooth/hci_core.h | 2 ++ net/bluetooth/hci_core.c | 4 ++++ net/bluetooth/hci_event.c | 21 +++++++++++++++++++++ 4 files changed, 34 insertions(+)