5ed884d765
In some cases the current 250ms delay is not enough for the remote to receive the keys, as can be witnessed by the following log: > ACL Data RX: Handle 64 flags 0x02 dlen 21 [hci1] 231.414217 SMP: Signing Information (0x0a) len 16 Signature key: 555bb66b7ab3abc9d5c287c97fe6eb29 < ACL Data TX: Handle 64 flags 0x00 dlen 21 [hci1] 231.414414 SMP: Encryption Information (0x06) len 16 Long term key: 2a7cdc233c9a4b1f3ed31dd9843fea29 < ACL Data TX: Handle 64 flags 0x00 dlen 15 [hci1] 231.414466 SMP: Master Identification (0x07) len 10 EDIV: 0xeccc Rand: 0x322e0ef50bd9308a < ACL Data TX: Handle 64 flags 0x00 dlen 21 [hci1] 231.414505 SMP: Signing Information (0x0a) len 16 Signature key: bbda1b2076e2325aa66fbcdd5388f745 > HCI Event: Number of Completed Packets (0x13) plen 5 [hci1] 231.483130 Num handles: 1 Handle: 64 Count: 2 < HCI Command: LE Start Encryption (0x08|0x0019) plen 28 [hci1] 231.664211 Handle: 64 Random number: 0x5052ad2b75fed54b Encrypted diversifier: 0xb7c2 Long term key: a336ede66711b49a84bde9b41426692e > HCI Event: Command Status (0x0f) plen 4 [hci1] 231.666937 LE Start Encryption (0x08|0x0019) ncmd 1 Status: Success (0x00) > HCI Event: Number of Completed Packets (0x13) plen 5 [hci1] 231.712646 Num handles: 1 Handle: 64 Count: 1 > HCI Event: Disconnect Complete (0x05) plen 4 [hci1] 232.562587 Status: Success (0x00) Handle: 64 Reason: Remote User Terminated Connection (0x13) As can be seen, the last key (Signing Information) is sent at 231.414505 but the completed packets event for it comes only at 231.712646, i.e. roughly 298ms later. To have a better margin of error this patch increases the delay to 500ms. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
164 lines
4.4 KiB
C
164 lines
4.4 KiB
C
/*
|
|
BlueZ - Bluetooth protocol stack for Linux
|
|
Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License version 2 as
|
|
published by the Free Software Foundation;
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
|
|
IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
|
|
CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
|
|
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
|
|
COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
|
|
SOFTWARE IS DISCLAIMED.
|
|
*/
|
|
|
|
#ifndef __SMP_H
|
|
#define __SMP_H
|
|
|
|
struct smp_command_hdr {
|
|
__u8 code;
|
|
} __packed;
|
|
|
|
#define SMP_CMD_PAIRING_REQ 0x01
|
|
#define SMP_CMD_PAIRING_RSP 0x02
|
|
struct smp_cmd_pairing {
|
|
__u8 io_capability;
|
|
__u8 oob_flag;
|
|
__u8 auth_req;
|
|
__u8 max_key_size;
|
|
__u8 init_key_dist;
|
|
__u8 resp_key_dist;
|
|
} __packed;
|
|
|
|
#define SMP_IO_DISPLAY_ONLY 0x00
|
|
#define SMP_IO_DISPLAY_YESNO 0x01
|
|
#define SMP_IO_KEYBOARD_ONLY 0x02
|
|
#define SMP_IO_NO_INPUT_OUTPUT 0x03
|
|
#define SMP_IO_KEYBOARD_DISPLAY 0x04
|
|
|
|
#define SMP_OOB_NOT_PRESENT 0x00
|
|
#define SMP_OOB_PRESENT 0x01
|
|
|
|
#define SMP_DIST_ENC_KEY 0x01
|
|
#define SMP_DIST_ID_KEY 0x02
|
|
#define SMP_DIST_SIGN 0x04
|
|
|
|
#define SMP_AUTH_NONE 0x00
|
|
#define SMP_AUTH_BONDING 0x01
|
|
#define SMP_AUTH_MITM 0x04
|
|
|
|
#define SMP_CMD_PAIRING_CONFIRM 0x03
|
|
struct smp_cmd_pairing_confirm {
|
|
__u8 confirm_val[16];
|
|
} __packed;
|
|
|
|
#define SMP_CMD_PAIRING_RANDOM 0x04
|
|
struct smp_cmd_pairing_random {
|
|
__u8 rand_val[16];
|
|
} __packed;
|
|
|
|
#define SMP_CMD_PAIRING_FAIL 0x05
|
|
struct smp_cmd_pairing_fail {
|
|
__u8 reason;
|
|
} __packed;
|
|
|
|
#define SMP_CMD_ENCRYPT_INFO 0x06
|
|
struct smp_cmd_encrypt_info {
|
|
__u8 ltk[16];
|
|
} __packed;
|
|
|
|
#define SMP_CMD_MASTER_IDENT 0x07
|
|
struct smp_cmd_master_ident {
|
|
__le16 ediv;
|
|
__le64 rand;
|
|
} __packed;
|
|
|
|
#define SMP_CMD_IDENT_INFO 0x08
|
|
struct smp_cmd_ident_info {
|
|
__u8 irk[16];
|
|
} __packed;
|
|
|
|
#define SMP_CMD_IDENT_ADDR_INFO 0x09
|
|
struct smp_cmd_ident_addr_info {
|
|
__u8 addr_type;
|
|
bdaddr_t bdaddr;
|
|
} __packed;
|
|
|
|
#define SMP_CMD_SIGN_INFO 0x0a
|
|
struct smp_cmd_sign_info {
|
|
__u8 csrk[16];
|
|
} __packed;
|
|
|
|
#define SMP_CMD_SECURITY_REQ 0x0b
|
|
struct smp_cmd_security_req {
|
|
__u8 auth_req;
|
|
} __packed;
|
|
|
|
#define SMP_PASSKEY_ENTRY_FAILED 0x01
|
|
#define SMP_OOB_NOT_AVAIL 0x02
|
|
#define SMP_AUTH_REQUIREMENTS 0x03
|
|
#define SMP_CONFIRM_FAILED 0x04
|
|
#define SMP_PAIRING_NOTSUPP 0x05
|
|
#define SMP_ENC_KEY_SIZE 0x06
|
|
#define SMP_CMD_NOTSUPP 0x07
|
|
#define SMP_UNSPECIFIED 0x08
|
|
#define SMP_REPEATED_ATTEMPTS 0x09
|
|
|
|
#define SMP_MIN_ENC_KEY_SIZE 7
|
|
#define SMP_MAX_ENC_KEY_SIZE 16
|
|
|
|
#define SMP_FLAG_TK_VALID 1
|
|
#define SMP_FLAG_CFM_PENDING 2
|
|
#define SMP_FLAG_MITM_AUTH 3
|
|
#define SMP_FLAG_LTK_ENCRYPT 4
|
|
#define SMP_FLAG_COMPLETE 5
|
|
|
|
#define SMP_REENCRYPT_TIMEOUT msecs_to_jiffies(500)
|
|
|
|
struct smp_chan {
|
|
struct l2cap_conn *conn;
|
|
u8 preq[7]; /* SMP Pairing Request */
|
|
u8 prsp[7]; /* SMP Pairing Response */
|
|
u8 prnd[16]; /* SMP Pairing Random (local) */
|
|
u8 rrnd[16]; /* SMP Pairing Random (remote) */
|
|
u8 pcnf[16]; /* SMP Pairing Confirm */
|
|
u8 tk[16]; /* SMP Temporary Key */
|
|
u8 enc_key_size;
|
|
u8 remote_key_dist;
|
|
bdaddr_t id_addr;
|
|
u8 id_addr_type;
|
|
u8 irk[16];
|
|
struct smp_csrk *csrk;
|
|
struct smp_csrk *slave_csrk;
|
|
struct smp_ltk *ltk;
|
|
struct smp_ltk *slave_ltk;
|
|
struct smp_irk *remote_irk;
|
|
unsigned long smp_flags;
|
|
struct work_struct confirm;
|
|
struct work_struct random;
|
|
struct delayed_work reencrypt;
|
|
};
|
|
|
|
/* SMP Commands */
|
|
bool smp_sufficient_security(struct hci_conn *hcon, u8 sec_level);
|
|
int smp_conn_security(struct hci_conn *hcon, __u8 sec_level);
|
|
int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb);
|
|
int smp_distribute_keys(struct l2cap_conn *conn);
|
|
int smp_user_confirm_reply(struct hci_conn *conn, u16 mgmt_op, __le32 passkey);
|
|
|
|
void smp_chan_destroy(struct l2cap_conn *conn);
|
|
|
|
bool smp_irk_matches(struct crypto_blkcipher *tfm, u8 irk[16],
|
|
bdaddr_t *bdaddr);
|
|
int smp_generate_rpa(struct crypto_blkcipher *tfm, u8 irk[16], bdaddr_t *rpa);
|
|
|
|
#endif /* __SMP_H */
|