espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-01 14:59:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[rcp] handle key ID mode 0 in LinkRawTransmitDone() (#13466)

Browse Source 
This commit updates `NcpBase::LinkRawTransmitDone()` to safely handle
frames using Key ID Mode 0 (e.g., KEK encryption for Joiner Entrust).

When frame security is enabled and `headerUpdated` is true, RCP encodes
the frame's key index and frame counter into the Spinel response. For
Key ID Mode 0, there is no Key Index field in the Aux Security Header,
so `GetKeyIndex()` can return an error.

Previously, `SuccessOrExit(GetKeyIndex(keyIndex))` caused the function
to exit prematurely, bypassing `mEncoder.EndFrame()`. This left the
Spinel response un-ended and caused Host timeouts during joining.

This commit updates the code to default `keyIndex` to `0` when
`GetKeyIndex()` returns an error, ensuring the Spinel status frame
is properly encoded and sent back to Host.
This commit is contained in:
Abtin Keshavarzian
2026-08-05 18:21:35 -07:00
committed by Jonathan Hui
parent 91474ad3da
commit 2c0d16d875
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ncp/ncp_base_radio.cpp
+9 -2
View File
@@ -195,10 +195,17 @@ void NcpBase::LinkRawTransmitDone(uint8_t aIid, otRadioFrame *aFrame, otRadioFra
uint8_t keyIndex;
uint32_t frameCounter;
// Transmit frame auxiliary key index and frame counter
SuccessOrExit(static_cast<Mac::TxFrame *>(aFrame)->GetKeyIndex(keyIndex));
SuccessOrExit(static_cast<Mac::TxFrame *>(aFrame)->GetFrameCounter(frameCounter));
// If the frame uses Key ID Mode 0, there is no Key Index field in
// the Security Header, so `GetKeyIndex()` may return an error.
// We default `keyIndex` to 0 in this case.
if (static_cast<Mac::TxFrame *>(aFrame)->GetKeyIndex(keyIndex) != OT_ERROR_NONE)
{
keyIndex = 0;
}
SuccessOrExit(mEncoder.WriteUint8(keyIndex));
SuccessOrExit(mEncoder.WriteUint32(frameCounter));
}