Skip to content

Commit baae033

Browse files
aescolarPavelVPV
aescolar
authored and
PavelVPV
committed
[nrf fromtree] tests/bsim/bluetooth/host/gatt: Enable RealEncryption
Let's run tests with security/privacy with the HW models acutually running the encryption, so in case of missaligned keys tests fail. Signed-off-by: Alberto Escolar Piedras <[email protected]> (cherry picked from commit 342e298)
1 parent 5674669 commit baae033

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

‎tests/bsim/bluetooth/host/gatt/caching/test_scripts/_run_test.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ BIN_SUFFIX=${bin_suffix:-}
1111
cd ${BSIM_OUT_PATH}/bin
1212

1313
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_caching_prj_conf${BIN_SUFFIX} \
14-
-v=${verbosity_level} -s=${simulation_id} -d=0 -testid=${client_id}
14+
-v=${verbosity_level} -s=${simulation_id} -d=0 -testid=${client_id} -RealEncryption=1
1515

1616
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_caching_prj_conf${BIN_SUFFIX} \
17-
-v=${verbosity_level} -s=${simulation_id} -d=1 -testid=${server_id}
17+
-v=${verbosity_level} -s=${simulation_id} -d=1 -testid=${server_id} -RealEncryption=1
1818

1919
Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
2020
-D=2 -sim_length=60e6 $@

‎tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ cd ${BSIM_OUT_PATH}/bin
1313
if [ "${1}" != 'debug0' ]; then
1414
Execute "./${test_exe}" \
1515
-v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
16-
-flash="${simulation_id}_client.log.bin" -flash_rm -argstest 10
16+
-flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1 -argstest 10
1717
fi
1818

1919
if [ "${1}" != 'debug1' ]; then
2020
Execute "./${test_exe}" \
2121
-v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral \
22-
-flash="${simulation_id}_server.log.bin" -flash_rm -argstest 10
22+
-flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1 -argstest 10
2323
fi
2424

2525
Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
@@ -28,13 +28,13 @@ Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
2828
if [ "${1}" == 'debug0' ]; then
2929
gdb --args "./${test_exe}" \
3030
-v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
31-
-flash="${simulation_id}_client.log.bin" -flash_rm -argstest 10
31+
-flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1 -argstest 10
3232
fi
3333

3434
if [ "${1}" == 'debug1' ]; then
3535
gdb --args "./${test_exe}" \
3636
-v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral \
37-
-flash="${simulation_id}_server.log.bin" -flash_rm -argstest 10
37+
-flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1 -argstest 10
3838
fi
3939

4040
wait_for_background_jobs

‎tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_2.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ cd ${BSIM_OUT_PATH}/bin
1313
if [ "${1}" != 'debug0' ]; then
1414
Execute "./${test_exe}" \
1515
-v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
16-
-flash="${simulation_id}_client.log.bin" -flash_rm -argstest 10
16+
-flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1 -argstest 10
1717
fi
1818

1919
if [ "${1}" != 'debug1' ]; then
2020
Execute "./${test_exe}" \
2121
-v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral \
22-
-flash="${simulation_id}_server.log.bin" -flash_rm -argstest 10
22+
-flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1 -argstest 10
2323
fi
2424

2525
Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
@@ -28,13 +28,13 @@ Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
2828
if [ "${1}" == 'debug0' ]; then
2929
gdb --args "./${test_exe}" \
3030
-v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central \
31-
-flash="${simulation_id}_client.log.bin" -flash_rm -argstest 10
31+
-flash="${simulation_id}_client.log.bin" -flash_rm -RealEncryption=1 -argstest 10
3232
fi
3333

3434
if [ "${1}" == 'debug1' ]; then
3535
gdb --args "./${test_exe}" \
3636
-v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral \
37-
-flash="${simulation_id}_server.log.bin" -flash_rm -argstest 10
37+
-flash="${simulation_id}_server.log.bin" -flash_rm -RealEncryption=1 -argstest 10
3838
fi
3939

4040
wait_for_background_jobs

‎tests/bsim/bluetooth/host/gatt/general/test_scripts/gatt.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ EXECUTE_TIMEOUT=120
1515
cd ${BSIM_OUT_PATH}/bin
1616

1717
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_general_prj_conf \
18-
-v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client
18+
-v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client -RealEncryption=1
1919

2020
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_general_prj_conf \
21-
-v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server
21+
-v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server -RealEncryption=1
2222

2323
Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
2424
-D=2 -sim_length=60e6 $@

‎tests/bsim/bluetooth/host/gatt/notify/test_scripts/_run_test.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ verbosity_level=2
1010
cd ${BSIM_OUT_PATH}/bin
1111

1212
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_notify_prj_conf \
13-
-v=${verbosity_level} -s=${simulation_id} -d=0 -testid=${client_id}
13+
-v=${verbosity_level} -s=${simulation_id} -d=0 -testid=${client_id} -RealEncryption=1
1414

1515
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_notify_prj_conf \
16-
-v=${verbosity_level} -s=${simulation_id} -d=1 -testid=${server_id}
16+
-v=${verbosity_level} -s=${simulation_id} -d=1 -testid=${server_id} -RealEncryption=1
1717

1818
Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
1919
-D=2 -sim_length=60e6 $@

‎tests/bsim/bluetooth/host/gatt/notify_multiple/test_scripts/notify.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ EXECUTE_TIMEOUT=120
1212
cd ${BSIM_OUT_PATH}/bin
1313

1414
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_notify_multiple_prj_conf \
15-
-v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client
15+
-v=${verbosity_level} -s=${simulation_id} -d=0 -testid=gatt_client -RealEncryption=1
1616

1717
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_gatt_notify_multiple_prj_conf \
18-
-v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server
18+
-v=${verbosity_level} -s=${simulation_id} -d=1 -testid=gatt_server -RealEncryption=1
1919

2020
Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
2121
-D=2 -sim_length=60e6 $@

‎tests/bsim/bluetooth/host/gatt/sc_indicate/test_scripts/sc_indicate.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ verbosity_level=2
1212
cd ${BSIM_OUT_PATH}/bin
1313

1414
Execute "./${test_exe}" \
15-
-v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central
15+
-v=${verbosity_level} -s=${simulation_id} -d=0 -testid=central -RealEncryption=1
1616

1717
Execute "./${test_exe}" \
18-
-v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral
18+
-v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral -RealEncryption=1
1919

2020
Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
2121
-D=2 -sim_length=60e6

0 commit comments

Comments
 (0)