test: Bluetooth: tester: Add support for EAD peripheral #97098

petrip-slab · 2025-10-07T08:48:47Z

Added three functions to support the EAD peripheral:
- Setting and storing key materials for EAD
- Encrypting data for EAD advertisements
- Decrypting data from EAD advertisements

This is new auto-pts command needed to encrypted adv qualification

Thalley · 2025-10-07T11:20:27Z

Reference to the autopts PR: auto-pts/auto-pts#1539

Copilot

Pull Request Overview

This PR adds support for Encrypted Advertising Data (EAD) peripheral functionality to the Bluetooth tester, enabling encrypted advertisement qualification tests for auto-PTS.

Added three new BTP GAP commands for EAD key material management, data encryption, and data decryption
Implemented functions to handle EAD operations including key storage, encryption, and decryption of advertisement data
Added corresponding BTP protocol definitions and command structures for EAD operations

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File	Description
tests/bluetooth/tester/src/btp_gap.c	Implements EAD functionality with key material storage and encrypt/decrypt functions
tests/bluetooth/tester/src/btp/btp_gap.h	Defines BTP protocol structures and opcodes for EAD commands

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

tests/bluetooth/tester/src/btp_gap.c

Thalley

Overall looks OK to me with some formatting and code style comments

tests/bluetooth/tester/src/btp/btp_gap.h

tests/bluetooth/tester/src/btp_gap.c

tests/bluetooth/tester/src/btp/btp_gap.h

tests/bluetooth/tester/src/btp_gap.c

sjanc · 2025-10-08T08:18:12Z

tests/bluetooth/tester/src/btp/btp_gap.h

@@ -389,6 +389,7 @@ struct btp_gap_bis_broadcast_cmd {
 } __packed;

 #define BTP_GAP_SET_RPA_TIMEOUT                 0x30
+


why this extra line?

removed idI don't I have done anything there. That empty line been there quite a while. Abd seen to separate two commands

a7eeea1 (Lyle Zhu 2025-07-22 18:17:00 +0800 389) } __packed;
a7eeea1 (Lyle Zhu 2025-07-22 18:17:00 +0800 390)
c8e28d1 (Evgenii Kosenko 2025-02-19 13:55:36 +0200 391) #define BTP_GAP_SET_RPA_TIMEOUT 0x30

sjanc · 2025-10-08T08:18:38Z

tests/bluetooth/tester/src/btp/btp_gap.h

new commands should be added here

sjanc · 2025-10-08T08:21:58Z

tests/bluetooth/tester/src/btp/btp_gap.h

+#define BTP_GAP_EAD_DECRYPT_ADV_DATA 0x33
+
+#define BTP_GAP_EAD_KEY_SIZE 16
+#define BTP_GAP_EAD_IV_SIZE  8


typically we name flags with command prefix, ie here it would be
BTP_GAP_EAD_SET_KEY_MATERIAL_KEY_SIZE
BTP_GAP_EAD_SET_KEY_MATERIAL_IV_SIZE

same for structure names (cmd and rp)
struct btp_gap_ead_encrypt_adv_data_cmd
struct btp_gap_ead_decrypt_adv_data_cmd

tests/bluetooth/tester/src/btp/btp_gap.h

sjanc · 2025-10-08T08:27:54Z

tests/bluetooth/tester/src/btp_gap.c

+#if defined(CONFIG_BT_EAD)
+	{
+		.opcode = BTP_GAP_EAD_SET_KEY_MATERIAL,
+		.expect_len = BTP_HANDLER_LENGTH_VARIABLE,


this command has fixed size

tests/bluetooth/tester/src/btp_gap.c

Thalley · 2025-10-08T08:47:37Z

We do actually also have self-tests of BTP and the BT Tester in BSIM now - Might be a good idea to add testing of these commands in a BSIM test

Thalley

Please remove the guard in the header file :)

Thalley · 2025-10-08T11:40:14Z

tests/bluetooth/tester/src/btp/btp_gap.h

+} __packed;
+
+struct btp_gap_ead_encrypt_adv_data_rp {


Suggested change

} __packed;

struct btp_gap_ead_encrypt_adv_data_rp {

} __packed;

struct btp_gap_ead_encrypt_adv_data_rp {

Copilot

Pull Request Overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

petrip-slab · 2025-10-09T08:04:31Z

I will do the bsim test in separate pull request. Saves trouble of retesting all the time but takes so study to do them properly.

sjanc · 2025-10-09T08:57:07Z

tests/bluetooth/tester/src/btp/btp_gap.h

@@ -599,3 +599,34 @@ int tester_gap_padv_stop(struct bt_le_ext_adv *ext_adv);
 int tester_gap_padv_create_sync(struct bt_le_per_adv_sync_param *create_params);
 int tester_gap_padv_stop_sync(void);
 #endif /* defined(CONFIG_BT_EXT_ADV) */
+
+#define BTP_GAP_EAD_SET_KEY_MATERIAL_KEY_SIZE 16


al this should be next to other commands definition

sjanc · 2025-10-09T09:01:08Z

tests/bluetooth/tester/src/btp_gap.c

+		return BTP_STATUS_FAILED;
+	}
+
+	err = bt_ead_encrypt(ead_key_materials.session_key, ead_key_materials.initialization_vector,


* @param[out] encrypted_payload Encrypted Ad Data including the Randomizer and * the MIC. Size must be at least @ref BT_EAD_RANDOMIZER_SIZE + @p * payload_size + @ref BT_EAD_MIC_SIZE. Use @ref * BT_EAD_ENCRYPTED_PAYLOAD_SIZE to get the right size.

Should this also be validated ? if if BT_EAD_ENCRYPTED_PAYLOAD_SIZE(cp->adv_data_len) would fit in response? to avoid invalid memory writes?

I was thinking the same, but figured that with ADV sizes of max 254 and the current MTU of 1024, this wouldn't be an issue, but Ideally we'd ensure that the response size is something like BT_EAD_ENCRYPTED_PAYLOAD_SIZE(UINT8_MAX) if EAD is enabled (can be done via a a BUILD_ASSERT)

I added a check on getting in the plain text after verifying that size of message is correct. Maximum seems to be 246

Maximum seems to be 246

Oh yeah, that makes sense, since the encrypted advertising data + MAC needs to be in the LTV

Added three functions to support the EAD peripheral: - Setting and storing key materials for EAD - Encrypting data for EAD advertisements - Decrypting data from EAD advertisements Signed-off-by: Petri Pitkanen <petri.pitkanen@silabs.com>

sonarqubecloud · 2025-10-09T10:46:46Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

sjanc

please move commands definition to proper place in btp.h

zephyrbot added area: Bluetooth Qualification Bluetooth Qualification -related issues and pull requests area: Tests Issues related to a particular existing or missing test area: Bluetooth labels Oct 7, 2025

zephyrbot requested review from jhedberg, nashif, sjanc and Thalley October 7, 2025 08:50

zephyrbot assigned sjanc Oct 7, 2025

Thalley requested a review from alwa-nordic October 7, 2025 11:11

Thalley requested a review from Copilot October 7, 2025 11:20

Copilot AI reviewed Oct 7, 2025

View reviewed changes

tests/bluetooth/tester/src/btp_gap.c Outdated Show resolved Hide resolved

tests/bluetooth/tester/src/btp_gap.c Outdated Show resolved Hide resolved

petrip-slab force-pushed the encrypted_adv_for_tester branch from c82c748 to 6919db6 Compare October 8, 2025 08:05

Thalley requested changes Oct 8, 2025

View reviewed changes

sjanc reviewed Oct 8, 2025

View reviewed changes

petrip-slab force-pushed the encrypted_adv_for_tester branch 2 times, most recently from 3507839 to 27202db Compare October 8, 2025 10:45

Thalley requested changes Oct 8, 2025

View reviewed changes

Thalley requested a review from Copilot October 8, 2025 11:40

Copilot AI reviewed Oct 8, 2025

View reviewed changes

petrip-slab force-pushed the encrypted_adv_for_tester branch from 27202db to c316c95 Compare October 9, 2025 08:03

petrip-slab requested a review from Thalley October 9, 2025 08:03

sjanc reviewed Oct 9, 2025

View reviewed changes

petrip-slab force-pushed the encrypted_adv_for_tester branch from c316c95 to 1794b7e Compare October 9, 2025 10:30

Thalley approved these changes Oct 9, 2025

View reviewed changes

sjanc requested changes Oct 9, 2025

View reviewed changes

		@@ -389,6 +389,7 @@ struct btp_gap_bis_broadcast_cmd {
		} __packed;

		#define BTP_GAP_SET_RPA_TIMEOUT 0x30

test: Bluetooth: tester: Add support for EAD peripheral #97098

Are you sure you want to change the base?

test: Bluetooth: tester: Add support for EAD peripheral #97098

Conversation

petrip-slab commented Oct 7, 2025

Uh oh!

Thalley commented Oct 7, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Thalley left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Thalley commented Oct 8, 2025

Uh oh!

Thalley left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

petrip-slab commented Oct 9, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Oct 9, 2025

Quality Gate passed

Uh oh!

sjanc left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!