From fd12e26e9b0e23a60965577f2948957868e12164 Mon Sep 17 00:00:00 2001 From: Pavel Vasilyev Date: Tue, 11 Nov 2025 14:18:16 +0100 Subject: [PATCH 1/3] [nrf fromtree] bluetooth: host: Deprecate CONFIG_BT_SIGNING This commit deprecates: - the `CONFIG_BT_SIGNING` Kconfig option - `BT_GATT_CHRC_AUTH` property IOW, this commit deprecates the LE Security mode 2 support. Explanation: Erratum ES-26047 introduced in Bluetooth Core Specification v6.2 requires SingCounter to be persistently stored to prevent replay attacks. Currently, the Host doesn't store SignCounter, therefore the device is vulnerable to replay attacks after reboot. Additionally, the current implementation doesn't assume that SignCounter of a received message can be incremented by more than one and thus may not validate correct message. The Bluetooth Security and Privacy Best Practices Guide recommends to not using Data signing and recommends to use LE Security mode 1 levels 2, 3 or 4 instead. The Signed Write Without Response sub-procedure, which is the only user of Data signing, is optional (see Vol 3, Part G, Table 4.1). See also ES-18901. The aforementioned reasons make no sense to keep this feature. Signed-off-by: Pavel Vasilyev (cherry picked from commit b7b35b89edb571be60fce832cb61fdc293e3ca2a) --- doc/releases/migration-guide-4.4.rst | 6 ++++ include/zephyr/bluetooth/gatt.h | 4 ++- samples/bluetooth/direct_adv/prj.conf | 1 - samples/bluetooth/direct_adv/src/main.c | 23 +++++++------ samples/bluetooth/peripheral/prj.conf | 1 - samples/bluetooth/peripheral/src/main.c | 33 ------------------- .../bluetooth/peripheral_accept_list/prj.conf | 1 - .../peripheral_accept_list/src/main.c | 18 +++++----- subsys/bluetooth/host/Kconfig | 1 + subsys/bluetooth/host/shell/gatt.c | 4 --- tests/bluetooth/init/prj_10.conf | 1 - tests/bluetooth/init/prj_11.conf | 1 - tests/bluetooth/init/prj_12.conf | 1 - tests/bluetooth/init/prj_13.conf | 1 - tests/bluetooth/init/prj_14.conf | 1 - tests/bluetooth/init/prj_17.conf | 1 - tests/bluetooth/init/prj_20.conf | 1 - tests/bluetooth/init/prj_21.conf | 1 - tests/bluetooth/init/prj_7.conf | 1 - tests/bluetooth/init/prj_8.conf | 1 - tests/bluetooth/init/prj_9.conf | 1 - tests/bluetooth/init/prj_ctlr.conf | 1 - tests/bluetooth/init/prj_ctlr_4_0.conf | 1 - tests/bluetooth/init/prj_ctlr_4_0_dbg.conf | 1 - tests/bluetooth/init/prj_ctlr_5_x_dbg.conf | 1 - tests/bluetooth/init/prj_ctlr_dbg.conf | 1 - tests/bluetooth/init/prj_ctlr_ticker.conf | 1 - tests/bluetooth/init/prj_ctlr_tiny.conf | 1 - tests/bluetooth/init/prj_llcp.conf | 1 - tests/bluetooth/shell/audio.conf | 1 - tests/bluetooth/shell/log.conf | 1 - tests/bluetooth/shell/mesh.conf | 1 - tests/bluetooth/shell/prj.conf | 1 - tests/bluetooth/shell/prj_br.conf | 1 - tests/bluetooth/tester/prj.conf | 1 - tests/bluetooth/tester/src/btp/btp_gatt.h | 8 ----- tests/bluetooth/tester/src/btp_gatt.c | 33 ------------------- tests/bsim/bluetooth/ll/conn/prj_split.conf | 1 - .../bsim/bluetooth/ll/conn/prj_split_1ms.conf | 1 - .../bluetooth/ll/conn/prj_split_hci_uart.conf | 1 - .../bluetooth/ll/conn/prj_split_low_lat.conf | 1 - .../bluetooth/ll/conn/prj_split_privacy.conf | 1 - .../ll/conn/prj_split_single_timer.conf | 1 - .../bluetooth/ll/conn/prj_split_tx_defer.conf | 1 - .../edtt/gatt_test_app/src/gatt/service_f_1.c | 3 +- .../ll/edtt/tests_scripts/gatt.llcp.test_list | 8 ++--- tests/bsim/bluetooth/tester/src/bsim_btp.c | 2 -- 47 files changed, 36 insertions(+), 142 deletions(-) diff --git a/doc/releases/migration-guide-4.4.rst b/doc/releases/migration-guide-4.4.rst index b10c86e9f23b..7966cd0f25e3 100644 --- a/doc/releases/migration-guide-4.4.rst +++ b/doc/releases/migration-guide-4.4.rst @@ -35,6 +35,12 @@ Device Drivers and Devicetree Bluetooth ********* +Bluetooth Host +============== + +* :kconfig:option:`CONFIG_BT_SIGNING` has been deprecated. +* :c:macro:`BT_GATT_CHRC_AUTH` has been deprecated. + Networking ********** diff --git a/include/zephyr/bluetooth/gatt.h b/include/zephyr/bluetooth/gatt.h index 17b125d602c5..045a24166226 100644 --- a/include/zephyr/bluetooth/gatt.h +++ b/include/zephyr/bluetooth/gatt.h @@ -462,9 +462,11 @@ struct bt_gatt_authorization_cb { /** * @brief Characteristic Authenticated Signed Writes property. * + * @deprecated This API is deprecated. + * * If set, permits signed writes to the Characteristic Value. */ -#define BT_GATT_CHRC_AUTH 0x40 +#define BT_GATT_CHRC_AUTH 0x40 __DEPRECATED_MACRO /** * @brief Characteristic Extended Properties property. * diff --git a/samples/bluetooth/direct_adv/prj.conf b/samples/bluetooth/direct_adv/prj.conf index 2af54670b51c..410ed9166302 100644 --- a/samples/bluetooth/direct_adv/prj.conf +++ b/samples/bluetooth/direct_adv/prj.conf @@ -4,7 +4,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT=y CONFIG_LOG=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_DIS=y CONFIG_BT_ATT_PREPARE_COUNT=1 diff --git a/samples/bluetooth/direct_adv/src/main.c b/samples/bluetooth/direct_adv/src/main.c index 992c6e46059c..24c3a53940c1 100644 --- a/samples/bluetooth/direct_adv/src/main.c +++ b/samples/bluetooth/direct_adv/src/main.c @@ -32,26 +32,25 @@ static const struct bt_uuid_128 read_characteristic_uuid = BT_UUID_INIT_128( static const struct bt_uuid_128 write_characteristic_uuid = BT_UUID_INIT_128( BT_UUID_128_ENCODE(0x12345678, 0x1234, 0x5678, 0x1234, 0x56789abcdef2)); -static int signed_value; +static int stored_value; static struct bt_le_adv_param adv_param; static bt_addr_le_t bond_addr; -static ssize_t read_signed(struct bt_conn *conn, const struct bt_gatt_attr *attr, - void *buf, uint16_t len, uint16_t offset) +static ssize_t read_cb(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf, + uint16_t len, uint16_t offset) { - int *value = &signed_value; + int *value = &stored_value; return bt_gatt_attr_read(conn, attr, buf, len, offset, value, - sizeof(signed_value)); + sizeof(stored_value)); } -static ssize_t write_signed(struct bt_conn *conn, const struct bt_gatt_attr *attr, - const void *buf, uint16_t len, uint16_t offset, - uint8_t flags) +static ssize_t write_cb(struct bt_conn *conn, const struct bt_gatt_attr *attr, const void *buf, + uint16_t len, uint16_t offset, uint8_t flags) { - int *value = &signed_value; + int *value = &stored_value; - if (offset + len > sizeof(signed_value)) { + if (offset + len > sizeof(stored_value)) { return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET); } @@ -66,11 +65,11 @@ BT_GATT_SERVICE_DEFINE(primary_service, BT_GATT_CHARACTERISTIC(&read_characteristic_uuid.uuid, BT_GATT_CHRC_READ, BT_GATT_PERM_READ, - read_signed, NULL, NULL), + read_cb, NULL, NULL), BT_GATT_CHARACTERISTIC(&write_characteristic_uuid.uuid, BT_GATT_CHRC_WRITE, BT_GATT_PERM_WRITE_ENCRYPT, - NULL, write_signed, NULL), + NULL, write_cb, NULL), ); static const struct bt_data ad[] = { diff --git a/samples/bluetooth/peripheral/prj.conf b/samples/bluetooth/peripheral/prj.conf index f788fa670aa3..493660afa339 100644 --- a/samples/bluetooth/peripheral/prj.conf +++ b/samples/bluetooth/peripheral/prj.conf @@ -4,7 +4,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT=y CONFIG_LOG=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_DIS=y CONFIG_BT_ATT_PREPARE_COUNT=5 diff --git a/samples/bluetooth/peripheral/src/main.c b/samples/bluetooth/peripheral/src/main.c index db77691db613..3f15aee100af 100644 --- a/samples/bluetooth/peripheral/src/main.c +++ b/samples/bluetooth/peripheral/src/main.c @@ -130,35 +130,6 @@ static struct bt_gatt_cep vnd_long_cep = { .properties = BT_GATT_CEP_RELIABLE_WRITE, }; -static int signed_value; - -static ssize_t read_signed(struct bt_conn *conn, const struct bt_gatt_attr *attr, - void *buf, uint16_t len, uint16_t offset) -{ - const char *value = attr->user_data; - - return bt_gatt_attr_read(conn, attr, buf, len, offset, value, - sizeof(signed_value)); -} - -static ssize_t write_signed(struct bt_conn *conn, const struct bt_gatt_attr *attr, - const void *buf, uint16_t len, uint16_t offset, - uint8_t flags) -{ - uint8_t *value = attr->user_data; - - if (offset + len > sizeof(signed_value)) { - return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET); - } - - memcpy(value + offset, buf, len); - - return len; -} - -static const struct bt_uuid_128 vnd_signed_uuid = BT_UUID_INIT_128( - BT_UUID_128_ENCODE(0x13345678, 0x1234, 0x5678, 0x1334, 0x56789abcdef3)); - static const struct bt_uuid_128 vnd_write_cmd_uuid = BT_UUID_INIT_128( BT_UUID_128_ENCODE(0x12345678, 0x1234, 0x5678, 0x1234, 0x56789abcdef4)); @@ -208,10 +179,6 @@ BT_GATT_SERVICE_DEFINE(vnd_svc, BT_GATT_PERM_PREPARE_WRITE, read_vnd, write_long_vnd, &vnd_long_value), BT_GATT_CEP(&vnd_long_cep), - BT_GATT_CHARACTERISTIC(&vnd_signed_uuid.uuid, BT_GATT_CHRC_READ | - BT_GATT_CHRC_WRITE | BT_GATT_CHRC_AUTH, - BT_GATT_PERM_READ | BT_GATT_PERM_WRITE, - read_signed, write_signed, &signed_value), BT_GATT_CHARACTERISTIC(&vnd_write_cmd_uuid.uuid, BT_GATT_CHRC_WRITE_WITHOUT_RESP, BT_GATT_PERM_WRITE, NULL, diff --git a/samples/bluetooth/peripheral_accept_list/prj.conf b/samples/bluetooth/peripheral_accept_list/prj.conf index 563ee758d2ec..a9a0e6ecedc8 100644 --- a/samples/bluetooth/peripheral_accept_list/prj.conf +++ b/samples/bluetooth/peripheral_accept_list/prj.conf @@ -4,7 +4,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT=y CONFIG_LOG=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_DIS=y CONFIG_BT_ATT_PREPARE_COUNT=1 diff --git a/samples/bluetooth/peripheral_accept_list/src/main.c b/samples/bluetooth/peripheral_accept_list/src/main.c index e14ea8dd9977..fcb930bdca55 100644 --- a/samples/bluetooth/peripheral_accept_list/src/main.c +++ b/samples/bluetooth/peripheral_accept_list/src/main.c @@ -29,26 +29,26 @@ static const struct bt_uuid_128 read_characteristic_uuid = BT_UUID_INIT_128( static const struct bt_uuid_128 write_characteristic_uuid = BT_UUID_INIT_128( BT_UUID_128_ENCODE(0x12345678, 0x1234, 0x5678, 0x1234, 0x56789abcdef2)); -static int signed_value; +static int stored_value; static struct bt_le_adv_param adv_param; static int bond_count; -static ssize_t read_signed(struct bt_conn *conn, const struct bt_gatt_attr *attr, +static ssize_t read_cb(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf, uint16_t len, uint16_t offset) { - int *value = &signed_value; + int *value = &stored_value; return bt_gatt_attr_read(conn, attr, buf, len, offset, value, - sizeof(signed_value)); + sizeof(stored_value)); } -static ssize_t write_signed(struct bt_conn *conn, const struct bt_gatt_attr *attr, +static ssize_t write_cb(struct bt_conn *conn, const struct bt_gatt_attr *attr, const void *buf, uint16_t len, uint16_t offset, uint8_t flags) { - int *value = &signed_value; + int *value = &stored_value; - if (offset + len > sizeof(signed_value)) { + if (offset + len > sizeof(stored_value)) { return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET); } @@ -63,11 +63,11 @@ BT_GATT_SERVICE_DEFINE(primary_service, BT_GATT_CHARACTERISTIC(&read_characteristic_uuid.uuid, BT_GATT_CHRC_READ, BT_GATT_PERM_READ, - read_signed, NULL, NULL), + read_cb, NULL, NULL), BT_GATT_CHARACTERISTIC(&write_characteristic_uuid.uuid, BT_GATT_CHRC_WRITE, BT_GATT_PERM_WRITE_ENCRYPT, - NULL, write_signed, NULL), + NULL, write_cb, NULL), ); static const struct bt_data ad[] = { diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig index 0d0bfd20a883..9eba33273066 100644 --- a/subsys/bluetooth/host/Kconfig +++ b/subsys/bluetooth/host/Kconfig @@ -562,6 +562,7 @@ config BT_RPA_SHARING config BT_SIGNING bool "Data signing support" + select DEPRECATED help This option enables data signing which is used for transferring authenticated data in an unencrypted connection. diff --git a/subsys/bluetooth/host/shell/gatt.c b/subsys/bluetooth/host/shell/gatt.c index 00dbd8dc8e26..013b878a6af3 100644 --- a/subsys/bluetooth/host/shell/gatt.c +++ b/subsys/bluetooth/host/shell/gatt.c @@ -172,10 +172,6 @@ static void print_chrc_props(uint8_t properties) bt_shell_print("[indicate]"); } - if (properties & BT_GATT_CHRC_AUTH) { - bt_shell_print("[auth]"); - } - if (properties & BT_GATT_CHRC_EXT_PROP) { bt_shell_print("[ext prop]"); } diff --git a/tests/bluetooth/init/prj_10.conf b/tests/bluetooth/init/prj_10.conf index 81503cadb9a1..a44edf5f7b64 100644 --- a/tests/bluetooth/init/prj_10.conf +++ b/tests/bluetooth/init/prj_10.conf @@ -2,7 +2,6 @@ CONFIG_BT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_BT_USE_DEBUG_KEYS=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_11.conf b/tests/bluetooth/init/prj_11.conf index a5492c5c1eb4..84510c4b8c86 100644 --- a/tests/bluetooth/init/prj_11.conf +++ b/tests/bluetooth/init/prj_11.conf @@ -2,7 +2,6 @@ CONFIG_BT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_BT_USE_DEBUG_KEYS=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y diff --git a/tests/bluetooth/init/prj_12.conf b/tests/bluetooth/init/prj_12.conf index 16fc86e8f823..3bf4b202d62e 100644 --- a/tests/bluetooth/init/prj_12.conf +++ b/tests/bluetooth/init/prj_12.conf @@ -1,7 +1,6 @@ CONFIG_BT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_BT_USE_DEBUG_KEYS=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y diff --git a/tests/bluetooth/init/prj_13.conf b/tests/bluetooth/init/prj_13.conf index aa8cc1220837..426b3d6aed5f 100644 --- a/tests/bluetooth/init/prj_13.conf +++ b/tests/bluetooth/init/prj_13.conf @@ -1,7 +1,6 @@ CONFIG_BT=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_BT_USE_DEBUG_KEYS=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y diff --git a/tests/bluetooth/init/prj_14.conf b/tests/bluetooth/init/prj_14.conf index 93423f647420..2a8566b9b467 100644 --- a/tests/bluetooth/init/prj_14.conf +++ b/tests/bluetooth/init/prj_14.conf @@ -2,5 +2,4 @@ CONFIG_BT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_17.conf b/tests/bluetooth/init/prj_17.conf index 5e504b9ead15..e179900c641b 100644 --- a/tests/bluetooth/init/prj_17.conf +++ b/tests/bluetooth/init/prj_17.conf @@ -2,7 +2,6 @@ CONFIG_BT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_BT_USE_DEBUG_KEYS=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y diff --git a/tests/bluetooth/init/prj_20.conf b/tests/bluetooth/init/prj_20.conf index 4b80a6b44271..80c0ad4657d4 100644 --- a/tests/bluetooth/init/prj_20.conf +++ b/tests/bluetooth/init/prj_20.conf @@ -2,7 +2,6 @@ CONFIG_BT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_BT_USE_DEBUG_KEYS=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y diff --git a/tests/bluetooth/init/prj_21.conf b/tests/bluetooth/init/prj_21.conf index 49c4c6eb452b..d796dcbdfc4a 100644 --- a/tests/bluetooth/init/prj_21.conf +++ b/tests/bluetooth/init/prj_21.conf @@ -2,7 +2,6 @@ CONFIG_BT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_BT_USE_DEBUG_KEYS=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y diff --git a/tests/bluetooth/init/prj_7.conf b/tests/bluetooth/init/prj_7.conf index 93423f647420..2a8566b9b467 100644 --- a/tests/bluetooth/init/prj_7.conf +++ b/tests/bluetooth/init/prj_7.conf @@ -2,5 +2,4 @@ CONFIG_BT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_8.conf b/tests/bluetooth/init/prj_8.conf index 2fdd77730098..6dfcf4d7f59c 100644 --- a/tests/bluetooth/init/prj_8.conf +++ b/tests/bluetooth/init/prj_8.conf @@ -2,6 +2,5 @@ CONFIG_BT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_9.conf b/tests/bluetooth/init/prj_9.conf index 2fdd77730098..6dfcf4d7f59c 100644 --- a/tests/bluetooth/init/prj_9.conf +++ b/tests/bluetooth/init/prj_9.conf @@ -2,6 +2,5 @@ CONFIG_BT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_ctlr.conf b/tests/bluetooth/init/prj_ctlr.conf index c733ef4ad3fc..67a638b1e078 100644 --- a/tests/bluetooth/init/prj_ctlr.conf +++ b/tests/bluetooth/init/prj_ctlr.conf @@ -3,7 +3,6 @@ CONFIG_BT_HCI_ACL_FLOW_CONTROL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y CONFIG_BT_GATT_CLIENT=y diff --git a/tests/bluetooth/init/prj_ctlr_4_0.conf b/tests/bluetooth/init/prj_ctlr_4_0.conf index 98dcaaa746c8..da51ab380e86 100644 --- a/tests/bluetooth/init/prj_ctlr_4_0.conf +++ b/tests/bluetooth/init/prj_ctlr_4_0.conf @@ -27,7 +27,6 @@ CONFIG_BT_HCI_VS=n CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y CONFIG_BT_GATT_CLIENT=y diff --git a/tests/bluetooth/init/prj_ctlr_4_0_dbg.conf b/tests/bluetooth/init/prj_ctlr_4_0_dbg.conf index 476213c82731..bc4125363d60 100644 --- a/tests/bluetooth/init/prj_ctlr_4_0_dbg.conf +++ b/tests/bluetooth/init/prj_ctlr_4_0_dbg.conf @@ -31,7 +31,6 @@ CONFIG_BT_CTLR_VS_SCAN_REQ_RX=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y CONFIG_BT_GATT_CLIENT=y diff --git a/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf b/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf index 828b486b88fc..0793716a8674 100644 --- a/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf +++ b/tests/bluetooth/init/prj_ctlr_5_x_dbg.conf @@ -55,7 +55,6 @@ CONFIG_BT_ISO_SYNC_RECEIVER=y CONFIG_BT_ISO_CENTRAL=y CONFIG_BT_ISO_PERIPHERAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_BT_USE_DEBUG_KEYS=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y diff --git a/tests/bluetooth/init/prj_ctlr_dbg.conf b/tests/bluetooth/init/prj_ctlr_dbg.conf index 956c562c5aa0..497d684c9e29 100644 --- a/tests/bluetooth/init/prj_ctlr_dbg.conf +++ b/tests/bluetooth/init/prj_ctlr_dbg.conf @@ -39,7 +39,6 @@ CONFIG_BT_HCI_MESH_EXT=n CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_BT_USE_DEBUG_KEYS=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y diff --git a/tests/bluetooth/init/prj_ctlr_ticker.conf b/tests/bluetooth/init/prj_ctlr_ticker.conf index ac15e8662a6b..bf5f351c72a2 100644 --- a/tests/bluetooth/init/prj_ctlr_ticker.conf +++ b/tests/bluetooth/init/prj_ctlr_ticker.conf @@ -37,7 +37,6 @@ CONFIG_BT_HCI_MESH_EXT=n CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_BT_USE_DEBUG_KEYS=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y diff --git a/tests/bluetooth/init/prj_ctlr_tiny.conf b/tests/bluetooth/init/prj_ctlr_tiny.conf index e3413d68e981..b625ea9918bb 100644 --- a/tests/bluetooth/init/prj_ctlr_tiny.conf +++ b/tests/bluetooth/init/prj_ctlr_tiny.conf @@ -31,7 +31,6 @@ CONFIG_BT_HCI_VS=n CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y CONFIG_BT_GATT_CLIENT=y diff --git a/tests/bluetooth/init/prj_llcp.conf b/tests/bluetooth/init/prj_llcp.conf index 2bbcfb83834a..2baa0f1e158e 100644 --- a/tests/bluetooth/init/prj_llcp.conf +++ b/tests/bluetooth/init/prj_llcp.conf @@ -3,7 +3,6 @@ CONFIG_BT_HCI_ACL_FLOW_CONTROL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_SMP_SC_ONLY=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y CONFIG_BT_GATT_CLIENT=y diff --git a/tests/bluetooth/shell/audio.conf b/tests/bluetooth/shell/audio.conf index 45236a49afae..a7f19336e777 100644 --- a/tests/bluetooth/shell/audio.conf +++ b/tests/bluetooth/shell/audio.conf @@ -21,7 +21,6 @@ CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_GATT_AUTO_DISCOVER_CCC=y CONFIG_BT_GATT_AUTO_UPDATE_MTU=y CONFIG_BT_L2CAP_ECRED=y -CONFIG_BT_SIGNING=y CONFIG_BT_APP_PASSKEY=y CONFIG_BT_ATT_PREPARE_COUNT=5 CONFIG_BT_SHELL=y diff --git a/tests/bluetooth/shell/log.conf b/tests/bluetooth/shell/log.conf index 2da43186e19f..7cb83fb87644 100644 --- a/tests/bluetooth/shell/log.conf +++ b/tests/bluetooth/shell/log.conf @@ -8,7 +8,6 @@ CONFIG_BT_CENTRAL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_APP_PASSKEY=y CONFIG_BT_ATT_PREPARE_COUNT=2 CONFIG_BT_GATT_CLIENT=y diff --git a/tests/bluetooth/shell/mesh.conf b/tests/bluetooth/shell/mesh.conf index 0336d417fb51..1e11b5ae75ca 100644 --- a/tests/bluetooth/shell/mesh.conf +++ b/tests/bluetooth/shell/mesh.conf @@ -9,7 +9,6 @@ CONFIG_BT_CENTRAL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_ATT_PREPARE_COUNT=2 CONFIG_BT_GATT_CLIENT=y CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y diff --git a/tests/bluetooth/shell/prj.conf b/tests/bluetooth/shell/prj.conf index 2c84d55bd69a..8a9fb1c0ee9e 100644 --- a/tests/bluetooth/shell/prj.conf +++ b/tests/bluetooth/shell/prj.conf @@ -10,7 +10,6 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y CONFIG_BT_SMP=y CONFIG_BT_PASSKEY_KEYPRESS=y -CONFIG_BT_SIGNING=y CONFIG_BT_APP_PASSKEY=y CONFIG_BT_ATT_PREPARE_COUNT=2 CONFIG_BT_GATT_CLIENT=y diff --git a/tests/bluetooth/shell/prj_br.conf b/tests/bluetooth/shell/prj_br.conf index 3f27954ca230..e9afa4026a34 100644 --- a/tests/bluetooth/shell/prj_br.conf +++ b/tests/bluetooth/shell/prj_br.conf @@ -11,7 +11,6 @@ CONFIG_BT_CENTRAL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_ATT_PREPARE_COUNT=2 CONFIG_BT_GATT_CLIENT=y CONFIG_BT_HRS=y diff --git a/tests/bluetooth/tester/prj.conf b/tests/bluetooth/tester/prj.conf index 382ed5eb6cdc..901042287ce9 100644 --- a/tests/bluetooth/tester/prj.conf +++ b/tests/bluetooth/tester/prj.conf @@ -14,7 +14,6 @@ CONFIG_BT_SMP_MIN_ENC_KEY_SIZE=7 CONFIG_BT_SMP_ENFORCE_MITM=n CONFIG_BT_SMP_ALLOW_UNAUTH_OVERWRITE=y CONFIG_BT_SMP_APP_PAIRING_ACCEPT=y -CONFIG_BT_SIGNING=y CONFIG_BT_BONDABLE=y CONFIG_BT_ATT_PREPARE_COUNT=12 CONFIG_BT_GATT_CLIENT=y diff --git a/tests/bluetooth/tester/src/btp/btp_gatt.h b/tests/bluetooth/tester/src/btp/btp_gatt.h index e26b3767b6a9..1eef848aa30e 100644 --- a/tests/bluetooth/tester/src/btp/btp_gatt.h +++ b/tests/bluetooth/tester/src/btp/btp_gatt.h @@ -240,14 +240,6 @@ struct btp_gatt_write_without_rsp_cmd { uint8_t data[]; } __packed; -#define BTP_GATT_SIGNED_WRITE_WITHOUT_RSP 0x16 -struct btp_gatt_signed_write_without_rsp_cmd { - bt_addr_le_t address; - uint16_t handle; - uint16_t data_length; - uint8_t data[]; -} __packed; - #define BTP_GATT_WRITE 0x17 struct btp_gatt_write_cmd { bt_addr_le_t address; diff --git a/tests/bluetooth/tester/src/btp_gatt.c b/tests/bluetooth/tester/src/btp_gatt.c index e5f4b9584937..e487dd2884d1 100644 --- a/tests/bluetooth/tester/src/btp_gatt.c +++ b/tests/bluetooth/tester/src/btp_gatt.c @@ -1757,34 +1757,6 @@ static uint8_t write_without_rsp(const void *cmd, uint16_t cmd_len, return BTP_STATUS_SUCCESS; } -static uint8_t write_signed_without_rsp(const void *cmd, uint16_t cmd_len, - void *rsp, uint16_t *rsp_len) -{ - const struct btp_gatt_signed_write_without_rsp_cmd *cp = cmd; - struct bt_conn *conn; - - if (cmd_len < sizeof(*cp) || - cmd_len != sizeof(*cp) + sys_le16_to_cpu(cp->data_length)) { - return BTP_STATUS_FAILED; - } - - conn = bt_conn_lookup_addr_le(BT_ID_DEFAULT, &cp->address); - if (!conn) { - return BTP_STATUS_FAILED; - } - - if (bt_gatt_write_without_response(conn, sys_le16_to_cpu(cp->handle), - cp->data, - sys_le16_to_cpu(cp->data_length), - true) < 0) { - bt_conn_unref(conn); - return BTP_STATUS_FAILED; - } - - bt_conn_unref(conn); - return BTP_STATUS_SUCCESS; -} - static void write_rsp(struct bt_conn *conn, uint8_t err, struct bt_gatt_write_params *params) { @@ -2533,11 +2505,6 @@ static const struct btp_handler handlers[] = { .expect_len = BTP_HANDLER_LENGTH_VARIABLE, .func = write_without_rsp, }, - { - .opcode = BTP_GATT_SIGNED_WRITE_WITHOUT_RSP, - .expect_len = BTP_HANDLER_LENGTH_VARIABLE, - .func = write_signed_without_rsp, - }, { .opcode = BTP_GATT_WRITE, .expect_len = BTP_HANDLER_LENGTH_VARIABLE, diff --git a/tests/bsim/bluetooth/ll/conn/prj_split.conf b/tests/bsim/bluetooth/ll/conn/prj_split.conf index 94eae38bf62e..c888d586e4b3 100644 --- a/tests/bsim/bluetooth/ll/conn/prj_split.conf +++ b/tests/bsim/bluetooth/ll/conn/prj_split.conf @@ -4,7 +4,6 @@ CONFIG_BT_CENTRAL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_BAS=y CONFIG_BT_HRS=y CONFIG_BT_ATT_PREPARE_COUNT=2 diff --git a/tests/bsim/bluetooth/ll/conn/prj_split_1ms.conf b/tests/bsim/bluetooth/ll/conn/prj_split_1ms.conf index 58276bd991e6..def3752f0167 100644 --- a/tests/bsim/bluetooth/ll/conn/prj_split_1ms.conf +++ b/tests/bsim/bluetooth/ll/conn/prj_split_1ms.conf @@ -4,7 +4,6 @@ CONFIG_BT_CENTRAL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_BAS=y CONFIG_BT_HRS=y CONFIG_BT_ATT_PREPARE_COUNT=2 diff --git a/tests/bsim/bluetooth/ll/conn/prj_split_hci_uart.conf b/tests/bsim/bluetooth/ll/conn/prj_split_hci_uart.conf index f97b14c88a7b..0ef6b9fb783d 100644 --- a/tests/bsim/bluetooth/ll/conn/prj_split_hci_uart.conf +++ b/tests/bsim/bluetooth/ll/conn/prj_split_hci_uart.conf @@ -5,7 +5,6 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y CONFIG_BT_SMP=y CONFIG_BT_SMP_SC_PAIR_ONLY=n -CONFIG_BT_SIGNING=y CONFIG_BT_BAS=y CONFIG_BT_HRS=y CONFIG_BT_ATT_PREPARE_COUNT=2 diff --git a/tests/bsim/bluetooth/ll/conn/prj_split_low_lat.conf b/tests/bsim/bluetooth/ll/conn/prj_split_low_lat.conf index b00b6c74b934..b07055f8dba6 100644 --- a/tests/bsim/bluetooth/ll/conn/prj_split_low_lat.conf +++ b/tests/bsim/bluetooth/ll/conn/prj_split_low_lat.conf @@ -4,7 +4,6 @@ CONFIG_BT_CENTRAL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_BAS=y CONFIG_BT_HRS=y CONFIG_BT_ATT_PREPARE_COUNT=2 diff --git a/tests/bsim/bluetooth/ll/conn/prj_split_privacy.conf b/tests/bsim/bluetooth/ll/conn/prj_split_privacy.conf index 1147e89ada69..02e83a4351f7 100644 --- a/tests/bsim/bluetooth/ll/conn/prj_split_privacy.conf +++ b/tests/bsim/bluetooth/ll/conn/prj_split_privacy.conf @@ -5,7 +5,6 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y CONFIG_BT_SMP=y CONFIG_BT_SMP_SC_PAIR_ONLY=n -CONFIG_BT_SIGNING=y CONFIG_BT_BAS=y CONFIG_BT_HRS=y CONFIG_BT_ATT_PREPARE_COUNT=2 diff --git a/tests/bsim/bluetooth/ll/conn/prj_split_single_timer.conf b/tests/bsim/bluetooth/ll/conn/prj_split_single_timer.conf index 9d446e0149f8..461b5e800958 100644 --- a/tests/bsim/bluetooth/ll/conn/prj_split_single_timer.conf +++ b/tests/bsim/bluetooth/ll/conn/prj_split_single_timer.conf @@ -4,7 +4,6 @@ CONFIG_BT_CENTRAL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_BAS=y CONFIG_BT_HRS=y CONFIG_BT_ATT_PREPARE_COUNT=2 diff --git a/tests/bsim/bluetooth/ll/conn/prj_split_tx_defer.conf b/tests/bsim/bluetooth/ll/conn/prj_split_tx_defer.conf index 22dc32be4c42..147a8f7598bb 100644 --- a/tests/bsim/bluetooth/ll/conn/prj_split_tx_defer.conf +++ b/tests/bsim/bluetooth/ll/conn/prj_split_tx_defer.conf @@ -4,7 +4,6 @@ CONFIG_BT_CENTRAL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_PRIVACY=y CONFIG_BT_SMP=y -CONFIG_BT_SIGNING=y CONFIG_BT_BAS=y CONFIG_BT_HRS=y CONFIG_BT_ATT_PREPARE_COUNT=2 diff --git a/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_f_1.c b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_f_1.c index 374e639862af..04ea7f4b7c5d 100644 --- a/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_f_1.c +++ b/tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_f_1.c @@ -1,5 +1,6 @@ /** * Copyright (c) 2019 Oticon A/S + * Copyright (c) 2025 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 */ @@ -381,7 +382,7 @@ static struct bt_gatt_attr service_f_1_attrs[] = { BT_GATT_PERM_READ, read_agg_format, NULL, &agg_format_value, 0xAF), BT_GATT_H_CHARACTERISTIC(BT_UUID_VALUE_V17, - BT_GATT_CHRC_READ | BT_GATT_CHRC_AUTH, + BT_GATT_CHRC_READ, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE, read_value_v17, NULL, &value_v17_value, 0xB0) }; diff --git a/tests/bsim/bluetooth/ll/edtt/tests_scripts/gatt.llcp.test_list b/tests/bsim/bluetooth/ll/edtt/tests_scripts/gatt.llcp.test_list index d606038298ce..d8ccaee301ef 100644 --- a/tests/bsim/bluetooth/ll/edtt/tests_scripts/gatt.llcp.test_list +++ b/tests/bsim/bluetooth/ll/edtt/tests_scripts/gatt.llcp.test_list @@ -8,8 +8,8 @@ GATT/SR/GAC/BV-01-C GATT/SR/GAD/BV-01-C GATT/SR/GAD/BV-02-C GATT/SR/GAD/BV-03-C -GATT/SR/GAD/BV-04-C -GATT/SR/GAD/BV-05-C +# GATT/SR/GAD/BV-04-C https://github.com/EDTTool/EDTT/issues/89 +# GATT/SR/GAD/BV-05-C https://github.com/EDTTool/EDTT/issues/89 GATT/SR/GAD/BV-06-C GATT/SR/GAR/BV-01-C GATT/SR/GAR/BI-01-C @@ -22,7 +22,7 @@ GATT/SR/GAR/BI-07-C GATT/SR/GAR/BI-09-C GATT/SR/GAR/BI-10-C #GATT/SR/GAR/BI-11-C https://github.com/EDTTool/EDTT/issues/82 -GATT/SR/GAR/BV-04-C +# GATT/SR/GAR/BV-04-C https://github.com/EDTTool/EDTT/issues/89 GATT/SR/GAR/BI-12-C GATT/SR/GAR/BI-13-C GATT/SR/GAR/BI-14-C @@ -64,7 +64,7 @@ GATT/SR/UNS/BI-02-C GATT/SR/GPA/BV-01-C GATT/SR/GPA/BV-02-C GATT/SR/GPA/BV-03-C -GATT/SR/GPA/BV-04-C +# GATT/SR/GPA/BV-04-C https://github.com/EDTTool/EDTT/issues/89 GATT/SR/GPA/BV-05-C GATT/SR/GPA/BV-06-C GATT/SR/GPA/BV-07-C diff --git a/tests/bsim/bluetooth/tester/src/bsim_btp.c b/tests/bsim/bluetooth/tester/src/bsim_btp.c index 2e24514b6606..19b196d1fe62 100644 --- a/tests/bsim/bluetooth/tester/src/bsim_btp.c +++ b/tests/bsim/bluetooth/tester/src/bsim_btp.c @@ -410,8 +410,6 @@ static bool is_valid_gatt_packet_len(const struct btp_hdr *hdr, struct net_buf_s } case BTP_GATT_WRITE_WITHOUT_RSP: return buf_simple->len == 0U; - case BTP_GATT_SIGNED_WRITE_WITHOUT_RSP: - return buf_simple->len == 0U; case BTP_GATT_WRITE: return buf_simple->len == sizeof(struct btp_gatt_write_rp); case BTP_GATT_WRITE_LONG: From fdd6aef98d256531a31826edda5516fb931a7cb6 Mon Sep 17 00:00:00 2001 From: Pavel Vasilyev Date: Tue, 11 Nov 2025 14:32:46 +0100 Subject: [PATCH 2/3] [nrf fromtree] tests: bluetooth: init: Remove duplicate prj_.conf files Remove duplicated prj.conf file. prj_6, prj_7, prj_14 are identicall. Since prj_6.conf is unchanged, keeping it. prj_8, prj_9, prj_15 are identicall. Since prj_15.conf is unchanged, keeping it. Signed-off-by: Pavel Vasilyev (cherry picked from commit 66679c1886513e8e1c41da3e47ece2195a783ed8) --- tests/bluetooth/init/prj_14.conf | 5 ----- tests/bluetooth/init/prj_7.conf | 5 ----- tests/bluetooth/init/prj_8.conf | 6 ------ tests/bluetooth/init/prj_9.conf | 6 ------ tests/bluetooth/init/testcase.yaml | 12 ------------ 5 files changed, 34 deletions(-) delete mode 100644 tests/bluetooth/init/prj_14.conf delete mode 100644 tests/bluetooth/init/prj_7.conf delete mode 100644 tests/bluetooth/init/prj_8.conf delete mode 100644 tests/bluetooth/init/prj_9.conf diff --git a/tests/bluetooth/init/prj_14.conf b/tests/bluetooth/init/prj_14.conf deleted file mode 100644 index 2a8566b9b467..000000000000 --- a/tests/bluetooth/init/prj_14.conf +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_BT=y -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=y -CONFIG_BT_SMP=y -CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_7.conf b/tests/bluetooth/init/prj_7.conf deleted file mode 100644 index 2a8566b9b467..000000000000 --- a/tests/bluetooth/init/prj_7.conf +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_BT=y -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=y -CONFIG_BT_SMP=y -CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_8.conf b/tests/bluetooth/init/prj_8.conf deleted file mode 100644 index 6dfcf4d7f59c..000000000000 --- a/tests/bluetooth/init/prj_8.conf +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_BT=y -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=y -CONFIG_BT_SMP=y -CONFIG_BT_SMP_SC_ONLY=y -CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/prj_9.conf b/tests/bluetooth/init/prj_9.conf deleted file mode 100644 index 6dfcf4d7f59c..000000000000 --- a/tests/bluetooth/init/prj_9.conf +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_BT=y -CONFIG_BT_PERIPHERAL=y -CONFIG_BT_CENTRAL=y -CONFIG_BT_SMP=y -CONFIG_BT_SMP_SC_ONLY=y -CONFIG_ZTEST=y diff --git a/tests/bluetooth/init/testcase.yaml b/tests/bluetooth/init/testcase.yaml index a5cc40cd39e7..bbefd93265c1 100644 --- a/tests/bluetooth/init/testcase.yaml +++ b/tests/bluetooth/init/testcase.yaml @@ -22,9 +22,6 @@ tests: bluetooth.init.test_13: extra_args: CONF_FILE=prj_13.conf platform_allow: qemu_cortex_m3 - bluetooth.init.test_14: - extra_args: CONF_FILE=prj_14.conf - platform_allow: qemu_cortex_m3 bluetooth.init.test_15: extra_args: CONF_FILE=prj_15.conf platform_allow: qemu_cortex_m3 @@ -64,15 +61,6 @@ tests: bluetooth.init.test_6: extra_args: CONF_FILE=prj_6.conf platform_allow: qemu_cortex_m3 - bluetooth.init.test_7: - extra_args: CONF_FILE=prj_7.conf - platform_allow: qemu_cortex_m3 - bluetooth.init.test_8: - extra_args: CONF_FILE=prj_8.conf - platform_allow: qemu_cortex_m3 - bluetooth.init.test_9: - extra_args: CONF_FILE=prj_9.conf - platform_allow: qemu_cortex_m3 bluetooth.init.test_ctlr: extra_args: - CONF_FILE=prj_ctlr.conf From 86bad3daf3bf2a2bea75601961d66651523a1df5 Mon Sep 17 00:00:00 2001 From: Pavel Vasilyev Date: Wed, 12 Nov 2025 23:20:14 +0100 Subject: [PATCH 3/3] [nrf fromtree] tests: bluetooth: qualification: Remove data signing related ICS This commit removes data signing related ICS. Removed ICS: - SM 6/1: Signing Algorithm Generation - SM 6/2: Signing Algorithm Resolving - GATT 3/13: Signed Write Without Response - GATT 9/10: Signed Write Command - GATT 7/3: LE Security mode 2 - GAP 25/2: LE Security mode 2 - GAP 35/2: LE Security mode 2 - GAP 25/5: Connection data signing procedure - GAP 35/5: Connection data signing procedure - GAP 25/6: Authenticate signed data procedure - GAP 35/6: Authenticate signed data procedure - GAP 27b/8: Connection Signature Resolving Key (CSRK) - GAP 37b/8: Connection Signature Resolving Key (CSRK) The following tests are not supported any longer: - GAP/SEC/CSIGN/BI-01-C - GAP/SEC/CSIGN/BI-02-C - GAP/SEC/CSIGN/BI-03-C - GAP/SEC/CSIGN/BI-04-C - GAP/SEC/CSIGN/BV-01-C - GAP/SEC/CSIGN/BV-02-C - GATT/CL/GAW/BV-02-C - SM/CEN/SIGN/BV-01-C Signed-off-by: Pavel Vasilyev (cherry picked from commit 116d4ddb89e909ea7c61d914e206a89dba2a3b22) --- .../ICS_Zephyr_Bluetooth_Host.bqw | 19 ++----- .../ICS_Zephyr_Bluetooth_Host.pts | 50 +------------------ 2 files changed, 4 insertions(+), 65 deletions(-) diff --git a/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.bqw b/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.bqw index 399f6eb0ed6b..1f0b30081209 100644 --- a/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.bqw +++ b/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.bqw @@ -1,8 +1,8 @@ - + - + @@ -54,7 +54,6 @@ GAP 31/10 GAP 32/1 GAP 32/2 - GAP 35/2 GAP 37/1 GAP 5/4 GAP 8a/1 @@ -84,7 +83,6 @@ GAP 21/5 GAP 23/2 GAP 25/1 - GAP 25/6 GAP 27/7 GAP 28/2 GAP 33/4 @@ -150,7 +148,6 @@ GAP 20A/19 GAP 30a/16 GAP 14a/10 - GAP 27b/8 GAP 27b/3 GAP 27b/6 GAP 25/11 @@ -217,7 +214,6 @@ GAP 33/5 GAP 34/3 GAP 35/3 - GAP 35/5 GAP 35/8 GAP 36/2 GAP 36/5 @@ -240,7 +236,6 @@ GAP 30a/6 GAP 27c/2 GAP 14a/6 - GAP 37b/8 GAP 25/14 GAP 14a/3 GAP 27c/3 @@ -252,14 +247,11 @@ GAP 20/5 GAP 20A/7 GAP 23/3 - GAP 25/2 - GAP 25/5 GAP 26/3 GAP 27/5 GAP 27a/1 GAP 27a/3 GAP 31/3 - GAP 35/6 GAP 37a/2 GAP 6/1 GAP 8a/11 @@ -369,7 +361,6 @@ GATT 9/7 GATT 10/8 GATT 3/30 - GATT 3/13 GATT 3/17 GATT 4/16 GATT 4/2 @@ -393,7 +384,6 @@ GATT 4/13 GATT 4/18 GATT 4/3 - GATT 7/3 GATT 4a/1 GATT 1/1 GATT 3/29 @@ -428,7 +418,6 @@ GATT 4/20 GATT 4/23 GATT 4/26 - GATT 9/10 GATT 3a/1 GATT 9/12 GATT 1a/1 @@ -448,12 +437,10 @@ SM 2/2 SM 5/1 SM 5/4 - SM 6/2 SM 1/1 SM 2/1 SM 4/1 SM 5/3 - SM 6/1 SM 7b/1 SM 4/3 SM 7b/3 @@ -3292,4 +3279,4 @@ - \ No newline at end of file + diff --git a/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.pts b/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.pts index 6f31ef84404c..38a5a2dfa67c 100644 --- a/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.pts +++ b/tests/bluetooth/qualification/ICS_Zephyr_Bluetooth_Host.pts @@ -1,6 +1,6 @@  - 347313 + 376799 Zephyr Host @@ -317,10 +317,6 @@ 14a
14 - - 37b
- 8 - 30a
16 @@ -381,10 +377,6 @@ 14a
10 - - 27b
- 8 - 27b
3 @@ -749,10 +741,6 @@ 25
10 - - 25
- 2 - 25
3 @@ -761,14 +749,6 @@ 25
4 - - 25
- 5 - - - 25
- 6 - 25
7 @@ -969,14 +949,6 @@ 35
4 - - 35
- 5 - - - 35
- 6 - 35
7 @@ -1311,10 +1283,6 @@ 2
3a - - 9
- 10 - 10
6 @@ -1491,10 +1459,6 @@ 3
12 - - 3
- 13 - 3
14 @@ -1679,10 +1643,6 @@ 7
2 - - 7
- 3 - 7
4 @@ -1782,14 +1742,6 @@ 5
4 - - 6
- 1 - - - 6
- 2 - ATT