michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix periph enc reject

Browse source 
Chose correct rejection PDU based on features supported on remote peer
when rejecting due to missing LTK.

Update unit test setup with faking that a feature exchange procedure
has run.

Signed-off-by: Thomas Ebert Hansen <thoh@oticon.com>
This commit is contained in:
Thomas Ebert Hansen 2022-03-30 16:20:23 +02:00 • committed by Carles Cufí
commit 268d00623b
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
subsys/bluetooth/controller/ll_sw/ull_llcp_enc.c
View file

@ -21,6 +21,7 @@
#include "pdu.h"
#include "ll.h"
#include "ll_feat.h"
#include "ll_settings.h"
#include "lll.h"
@ -33,6 +34,7 @@
#include "ull_internal.h"
#include "ull_llcp.h"
#include "ull_llcp_internal.h"
#include "ull_llcp_features.h"
#include "ull_conn_internal.h"
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
@ -652,9 +654,12 @@ static struct node_tx *llcp_rp_enc_tx(struct ll_conn *conn, struct proc_ctx *ctx
llcp_pdu_encode_pause_enc_rsp(pdu);
break;
case PDU_DATA_LLCTRL_TYPE_REJECT_IND:
/* TODO(thoh): Select between LL_REJECT_IND and LL_REJECT_EXT_IND */
if (conn->llcp.fex.valid && feature_ext_rej_ind(conn)) {
llcp_pdu_encode_reject_ext_ind(pdu, PDU_DATA_LLCTRL_TYPE_ENC_REQ,
BT_HCI_ERR_PIN_OR_KEY_MISSING);
} else {
llcp_pdu_encode_reject_ind(pdu, BT_HCI_ERR_PIN_OR_KEY_MISSING);
}
break;
default:
LL_ASSERT(0);

5
tests/bluetooth/controller/ctrl_encrypt/src/main.c
View file

@ -23,6 +23,7 @@
#include "pdu.h"
#include "ll.h"
#include "ll_feat.h"
#include "ll_settings.h"
#include "lll.h"
@ -93,6 +94,10 @@ struct ll_conn conn;
static void setup(void)
{
test_setup(&conn);
/* Fake that a Feature exchange proceudre has been executed */
conn.llcp.fex.valid = 1U;
conn.llcp.fex.features_used |= LL_FEAT_BIT_EXT_REJ_IND;
}
void ecb_encrypt(uint8_t const *const key_le, uint8_t const *const clear_text_le,