michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Host: Rename long error codes

Browse source 
Rename AUTHENTICATION, to AUTH, since this is a well established short
form of the word.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2019-08-26 17:27:54 +02:00 • committed by Carles Cufí
commit 3320b51644
7 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/bluetooth/conn.h
View file

@ -345,7 +345,7 @@ enum bt_security_err {
BT_SECURITY_ERR_SUCCESS,
/** Authentication failed. */
BT_SECURITY_ERR_AUTHENTICATION_FAIL,
BT_SECURITY_ERR_AUTH_FAIL,
/** PIN or encryption key is missing. */
BT_SECURITY_ERR_PIN_OR_KEY_MISSING,
@ -354,7 +354,7 @@ enum bt_security_err {
BT_SECURITY_ERR_OOB_NOT_AVAILABLE,
/** The requested security level could not be reached. */
BT_SECURITY_ERR_AUTHENTICATION_REQUIREMENT,
BT_SECURITY_ERR_AUTH_REQUIREMENT,
/** Pairing is not supported */
BT_SECURITY_ERR_PAIR_NOT_SUPPORTED,

4
include/bluetooth/hci.h
View file

@ -108,7 +108,7 @@ static inline bool bt_addr_le_is_identity(const bt_addr_le_t *addr)
#define BT_HCI_ERR_UNKNOWN_CONN_ID 0x02
#define BT_HCI_ERR_HW_FAILURE 0x03
#define BT_HCI_ERR_PAGE_TIMEOUT 0x04
#define BT_HCI_ERR_AUTHENTICATION_FAIL 0x05
#define BT_HCI_ERR_AUTH_FAIL 0x05
#define BT_HCI_ERR_PIN_OR_KEY_MISSING 0x06
#define BT_HCI_ERR_MEM_CAPACITY_EXCEEDED 0x07
#define BT_HCI_ERR_CONN_TIMEOUT 0x08
@ -141,6 +141,8 @@ static inline bool bt_addr_le_is_identity(const bt_addr_le_t *addr)
#define BT_HCI_ERR_TERM_DUE_TO_MIC_FAIL 0x3d
#define BT_HCI_ERR_CONN_FAIL_TO_ESTAB 0x3e
#define BT_HCI_ERR_AUTHENTICATION_FAIL __DEPRECATED_MACRO BT_HCI_ERR_AUTH_FAIL
/* EIR/AD data type definitions */
#define BT_DATA_FLAGS 0x01 /* AD flags */
#define BT_DATA_UUID16_SOME 0x02 /* 16-bit UUID, more available */

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

@ -110,7 +110,7 @@ static void pairing_complete(struct bt_conn *conn, bool bonded)
static void pairing_failed(struct bt_conn *conn, enum bt_security_err reason)
{
printk("Pairing Failed (%d). Disconnecting.\n", reason);
bt_conn_disconnect(conn, BT_HCI_ERR_AUTHENTICATION_FAIL);
bt_conn_disconnect(conn, BT_HCI_ERR_AUTH_FAIL);
}
static struct bt_conn_auth_cb auth_cb_display = {

2
subsys/bluetooth/host/conn.c
View file

@ -2457,7 +2457,7 @@ int bt_conn_auth_cancel(struct bt_conn *conn)
return ssp_passkey_neg_reply(conn);
case PASSKEY_DISPLAY:
return bt_conn_disconnect(conn,
BT_HCI_ERR_AUTHENTICATION_FAIL);
BT_HCI_ERR_AUTH_FAIL);
case LEGACY:
return pin_code_neg_reply(&conn->br.dst);
default:

12
subsys/bluetooth/host/hci_core.c
View file

@ -1685,8 +1685,8 @@ static enum bt_security_err security_err_get(u8_t hci_err)
switch (hci_err) {
case BT_HCI_ERR_SUCCESS:
return BT_SECURITY_ERR_SUCCESS;
case BT_HCI_ERR_AUTHENTICATION_FAIL:
return BT_SECURITY_ERR_AUTHENTICATION_FAIL;
case BT_HCI_ERR_AUTH_FAIL:
return BT_SECURITY_ERR_AUTH_FAIL;
case BT_HCI_ERR_PIN_OR_KEY_MISSING:
return BT_SECURITY_ERR_PIN_OR_KEY_MISSING;
case BT_HCI_ERR_PAIRING_NOT_SUPPORTED:
@ -1906,13 +1906,13 @@ static bool update_sec_level_br(struct bt_conn *conn)
if (!br_sufficient_key_size(conn)) {
BT_ERR("Encryption key size is not sufficient");
bt_conn_disconnect(conn, BT_HCI_ERR_AUTHENTICATION_FAIL);
bt_conn_disconnect(conn, BT_HCI_ERR_AUTH_FAIL);
return false;
}
if (conn->required_sec_level > conn->sec_level) {
BT_ERR("Failed to set required security level");
bt_conn_disconnect(conn, BT_HCI_ERR_AUTHENTICATION_FAIL);
bt_conn_disconnect(conn, BT_HCI_ERR_AUTH_FAIL);
return false;
}
@ -2272,7 +2272,7 @@ static void ssp_complete(struct net_buf *buf)
bt_conn_ssp_auth_complete(conn, security_err_get(evt->status));
if (evt->status) {
bt_conn_disconnect(conn, BT_HCI_ERR_AUTHENTICATION_FAIL);
bt_conn_disconnect(conn, BT_HCI_ERR_AUTH_FAIL);
}
bt_conn_unref(conn);
@ -3066,7 +3066,7 @@ static void update_sec_level(struct bt_conn *conn)
if (conn->required_sec_level > conn->sec_level) {
BT_ERR("Failed to set required security level");
bt_conn_disconnect(conn, BT_HCI_ERR_AUTHENTICATION_FAIL);
bt_conn_disconnect(conn, BT_HCI_ERR_AUTH_FAIL);
}
}
#endif /* CONFIG_BT_SMP */

3
subsys/bluetooth/host/l2cap_br.c
View file

@ -759,8 +759,7 @@ static void l2cap_br_conn_req(struct bt_l2cap_br *l2cap, u8_t ident,
if (result != BT_L2CAP_BR_SUCCESS) {
/* Disconnect link when security rules were violated */
if (result == BT_L2CAP_BR_ERR_SEC_BLOCK) {
bt_conn_disconnect(conn,
BT_HCI_ERR_AUTHENTICATION_FAIL);
bt_conn_disconnect(conn, BT_HCI_ERR_AUTH_FAIL);
}
return;

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

@ -347,12 +347,12 @@ static enum bt_security_err auth_err_get(u8_t smp_err)
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;
return BT_SECURITY_ERR_AUTH_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;
return BT_SECURITY_ERR_AUTH_REQUIREMENT;
case BT_SMP_ERR_PAIRING_NOTSUPP:
case BT_SMP_ERR_CMD_NOTSUPP:
return BT_SECURITY_ERR_PAIR_NOT_SUPPORTED;