michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: SMP: Add pairing failed reason

Browse source 
Forward the pairing failed SMP status code to the application

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2019-07-03 13:46:03 +02:00 • committed by Carles Cufí
commit 1fb68828ef
5 changed files with 72 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

33
include/bluetooth/conn.h
View file

@ -323,6 +323,35 @@ int bt_conn_security(struct bt_conn *conn, bt_security_t sec);
*/ */
u8_t bt_conn_enc_key_size(struct bt_conn *conn); u8_t bt_conn_enc_key_size(struct bt_conn *conn);
enum bt_security_err {
/** Security procedure successful. */
BT_SECURITY_ERR_SUCCESS,
/** Authentication failed. */
BT_SECURITY_ERR_AUTHENTICATION_FAIL,
/** PIN or encryption key is missing. */
BT_SECURITY_ERR_PIN_OR_KEY_MISSING,
/** OOB data is not available. */
BT_SECURITY_ERR_OOB_NOT_AVAILABLE,
/** The requested security level could not be reached. */
BT_SECURITY_ERR_AUTHENTICATION_REQUIREMENT,
/** Pairing is not supported */
BT_SECURITY_ERR_PAIR_NOT_SUPPORTED,
/** Pairing is not allowed. */
BT_SECURITY_ERR_PAIR_NOT_ALLOWED,
/** Invalid parameters. */
BT_SECURITY_ERR_INVALID_PARAM,
/** Pairing failed but the exact reason could not be specified. */
BT_SECURITY_ERR_UNSPECIFIED,
};
/** @brief Connection callback structure. /** @brief Connection callback structure.
* *
* This structure is used for tracking the state of a connection. * This structure is used for tracking the state of a connection.
@ -698,8 +727,10 @@ struct bt_conn_auth_cb {
/** @brief notify that pairing process has failed. /** @brief notify that pairing process has failed.
* *
* @param conn Connection object. * @param conn Connection object.
* @param reason Pairing failed reason
*/ */
void (*pairing_failed)(struct bt_conn *conn); void (*pairing_failed)(struct bt_conn *conn,
enum bt_security_err reason);
}; };
/** @brief Register authentication callbacks. /** @brief Register authentication callbacks.

4
samples/bluetooth/peripheral_sc_only/src/main.c
View file

@ -102,9 +102,9 @@ static void pairing_complete(struct bt_conn *conn, bool bonded)
printk("Pairing Complete\n"); printk("Pairing Complete\n");
} }
static void pairing_failed(struct bt_conn *conn) static void pairing_failed(struct bt_conn *conn, enum bt_security_err reason)
{ {
printk("Pairing Failed. Disconnecting.\n"); printk("Pairing Failed (%d). Disconnecting.\n", reason);
bt_conn_disconnect(conn, BT_HCI_ERR_AUTHENTICATION_FAIL); bt_conn_disconnect(conn, BT_HCI_ERR_AUTHENTICATION_FAIL);
} }

4
samples/boards/reel_board/mesh_badge/src/main.c
View file

@ -106,9 +106,9 @@ static void pairing_complete(struct bt_conn *conn, bool bonded)
board_show_text("Pairing Complete", false, K_SECONDS(2)); board_show_text("Pairing Complete", false, K_SECONDS(2));
} }
static void pairing_failed(struct bt_conn *conn) static void pairing_failed(struct bt_conn *conn, enum bt_security_err reason)
{ {
printk("Pairing Failed\n"); printk("Pairing Failed (%d)\n", reason);
board_show_text("Pairing Failed", false, K_SECONDS(2)); board_show_text("Pairing Failed", false, K_SECONDS(2));
} }

34
subsys/bluetooth/host/smp.c
View file

@ -330,6 +330,34 @@ static u8_t get_pair_method(struct bt_smp *smp, u8_t remote_io)
return gen_method_sc[remote_io][get_io_capa()]; return gen_method_sc[remote_io][get_io_capa()];
} }
static enum bt_security_err auth_err_get(u8_t smp_err)
{
switch (smp_err) {
case BT_SMP_ERR_PASSKEY_ENTRY_FAILED:
case BT_SMP_ERR_DHKEY_CHECK_FAILED:
case BT_SMP_ERR_NUMERIC_COMP_FAILED:
case BT_SMP_ERR_CONFIRM_FAILED:
return BT_SECURITY_ERR_AUTHENTICATION_FAIL;
case BT_SMP_ERR_OOB_NOT_AVAIL:
return BT_SECURITY_ERR_OOB_NOT_AVAILABLE;
case BT_SMP_ERR_AUTH_REQUIREMENTS:
case BT_SMP_ERR_ENC_KEY_SIZE:
return BT_SECURITY_ERR_AUTHENTICATION_REQUIREMENT;
case BT_SMP_ERR_PAIRING_NOTSUPP:
case BT_SMP_ERR_CMD_NOTSUPP:
return BT_SECURITY_ERR_PAIR_NOT_SUPPORTED;
case BT_SMP_ERR_REPEATED_ATTEMPTS:
case BT_SMP_ERR_BREDR_PAIRING_IN_PROGRESS:
case BT_SMP_ERR_CROSS_TRANSP_NOT_ALLOWED:
return BT_SECURITY_ERR_PAIR_NOT_ALLOWED;
case BT_SMP_ERR_INVALID_PARAMS:
return BT_SECURITY_ERR_INVALID_PARAM;
case BT_SMP_ERR_UNSPECIFIED:
default:
return BT_SECURITY_ERR_UNSPECIFIED;
}
}
static struct net_buf *smp_create_pdu(struct bt_conn *conn, u8_t op, static struct net_buf *smp_create_pdu(struct bt_conn *conn, u8_t op,
size_t len) size_t len)
{ {
@ -756,7 +784,8 @@ static void smp_pairing_br_complete(struct bt_smp_br *smp, u8_t status)
} }
if (bt_auth && bt_auth->pairing_failed) { if (bt_auth && bt_auth->pairing_failed) {
bt_auth->pairing_failed(smp->chan.chan.conn); bt_auth->pairing_failed(smp->chan.chan.conn,
auth_err_get(status));
} }
} else { } else {
bool bond_flag = atomic_test_bit(smp->flags, SMP_FLAG_BOND); bool bond_flag = atomic_test_bit(smp->flags, SMP_FLAG_BOND);
@ -1556,7 +1585,8 @@ static void smp_pairing_complete(struct bt_smp *smp, u8_t status)
bond_flag); bond_flag);
} }
} else if (bt_auth && bt_auth->pairing_failed) { } else if (bt_auth && bt_auth->pairing_failed) {
bt_auth->pairing_failed(smp->chan.chan.conn); bt_auth->pairing_failed(smp->chan.chan.conn,
auth_err_get(status));
} }
smp_reset(smp); smp_reset(smp);

6
subsys/bluetooth/shell/bt.c
View file

@ -1239,13 +1239,15 @@ static void auth_pairing_complete(struct bt_conn *conn, bool bonded)
addr); addr);
} }
static void auth_pairing_failed(struct bt_conn *conn) static void auth_pairing_failed(struct bt_conn *conn,
enum bt_security_err reason)
{ {
char addr[BT_ADDR_LE_STR_LEN]; char addr[BT_ADDR_LE_STR_LEN];
bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
shell_print(ctx_shell, "Pairing failed with %s", addr); shell_print(ctx_shell, "Pairing failed with %s reason %d", addr,
reason);
} }
#if defined(CONFIG_BT_BREDR) #if defined(CONFIG_BT_BREDR)