Skip to content

[radio] encrypt the wake-up frame #989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhanglongxia wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[radio] encrypt the wake-up frame #989

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/src/radio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,17 @@ otError otPlatRadioReceiveAt(otInstance *aInstance, uint8_t aChannel, uint32_t a
}
#endif

#if OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2
static bool ShouldProcessKeyId(otRadioFrame *aFrame)
{
return
#if OPENTHREAD_CONFIG_WAKEUP_COORDINATOR_ENABLE
otMacFrameIsKeyIdMode2(aFrame) ||
#endif
otMacFrameIsKeyIdMode1(aFrame);
}
#endif

otError otPlatRadioTransmit(otInstance *aInstance, otRadioFrame *aFrame)
{
bool result = true;
Expand All @@ -536,10 +547,12 @@ otError otPlatRadioTransmit(otInstance *aInstance, otRadioFrame *aFrame)
}

#if OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2
if (otMacFrameIsSecurityEnabled(aFrame) && otMacFrameIsKeyIdMode1(aFrame) && !aFrame->mInfo.mTxInfo.mIsARetx)
if (otMacFrameIsSecurityEnabled(aFrame) && ShouldProcessKeyId(aFrame) && !aFrame->mInfo.mTxInfo.mIsHeaderUpdated &&
!aFrame->mInfo.mTxInfo.mIsARetx)
{
otMacFrameSetKeyId(aFrame, sKeyId);
otMacFrameSetFrameCounter(aFrame, sMacFrameCounter++);
aFrame->mInfo.mTxInfo.mIsHeaderUpdated = true;
}

if (aFrame->mInfo.mTxInfo.mTxDelay != 0)
Expand Down Expand Up @@ -1257,7 +1270,7 @@ void nrf_802154_tx_started(const uint8_t *aFrame)
#endif // OPENTHREAD_CONFIG_TIME_SYNC_ENABLE

#if OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2
otEXPECT(otMacFrameIsSecurityEnabled(&sTransmitFrame) && otMacFrameIsKeyIdMode1(&sTransmitFrame) &&
otEXPECT(otMacFrameIsSecurityEnabled(&sTransmitFrame) && ShouldProcessKeyId(&sTransmitFrame) &&
!sTransmitFrame.mInfo.mTxInfo.mIsSecurityProcessed);

sTransmitFrame.mInfo.mTxInfo.mAesKey = &sCurrKey;
Expand Down