Commit 268d0062 authored by Thomas Ebert Hansen's avatar Thomas Ebert Hansen Committed by Carles Cufi
Browse files

Bluetooth: controller: Fix periph enc reject 



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: default avatarThomas Ebert Hansen <thoh@oticon.com>
parent 06feb020

subsys/bluetooth/controller/ll_sw/ull_llcp_enc.c

+8 −3
Original line number Diff line number Diff line
@@ -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);

tests/bluetooth/controller/ctrl_encrypt/src/main.c

+5 −0
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE