You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2022/08/05 08:33:17 UTC
[mynewt-nimble] 02/02: nimble/phy/nrf: Wait for CCM to finish decryption
This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 3bb185daad2296c02d4efd13760b4b884d70d7e4
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Thu Aug 4 11:47:32 2022 +0200
nimble/phy/nrf: Wait for CCM to finish decryption
In extremely rare cases seems like ENDCRYPT flag is not set before we
check for MISTATUS, so just spin a bit in that case and wait for CCM to
finish.
---
nimble/drivers/nrf52/src/ble_phy.c | 14 ++++----------
nimble/drivers/nrf5340/src/ble_phy.c | 14 ++++----------
2 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/nimble/drivers/nrf52/src/ble_phy.c b/nimble/drivers/nrf52/src/ble_phy.c
index 9b441238..c06536a9 100644
--- a/nimble/drivers/nrf52/src/ble_phy.c
+++ b/nimble/drivers/nrf52/src/ble_phy.c
@@ -1100,6 +1100,10 @@ ble_phy_rx_end_isr(void)
ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_CRC_OK;
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
if (g_ble_phy_data.phy_encrypted) {
+ while (NRF_CCM->EVENTS_ENDCRYPT == 0) {
+ /* Make sure CCM finished */
+ };
+
/* Only set MIC failure flag if frame is not zero length */
if ((dptr[1] != 0) && (NRF_CCM->MICSTATUS == 0)) {
ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_MIC_FAILURE;
@@ -1115,16 +1119,6 @@ ble_phy_rx_end_isr(void)
STATS_INC(ble_phy_stats, rx_hw_err);
ble_hdr->rxinfo.flags &= ~BLE_MBUF_HDR_F_CRC_OK;
}
-
- /*
- * XXX: This is a total hack work-around for now but I dont
- * know what else to do. If ENDCRYPT is not set and we are
- * encrypted we need to not trust this frame and drop it.
- */
- if (NRF_CCM->EVENTS_ENDCRYPT == 0) {
- STATS_INC(ble_phy_stats, rx_hw_err);
- ble_hdr->rxinfo.flags &= ~BLE_MBUF_HDR_F_CRC_OK;
- }
}
#endif
}
diff --git a/nimble/drivers/nrf5340/src/ble_phy.c b/nimble/drivers/nrf5340/src/ble_phy.c
index 060e32ee..51b80a56 100644
--- a/nimble/drivers/nrf5340/src/ble_phy.c
+++ b/nimble/drivers/nrf5340/src/ble_phy.c
@@ -958,6 +958,10 @@ ble_phy_rx_end_isr(void)
ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_CRC_OK;
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
if (g_ble_phy_data.phy_encrypted) {
+ while (NRF_CCM_NS->EVENTS_ENDCRYPT == 0) {
+ /* Make sure CCM finished */
+ };
+
/* Only set MIC failure flag if frame is not zero length */
if ((dptr[1] != 0) && (NRF_CCM_NS->MICSTATUS == 0)) {
ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_MIC_FAILURE;
@@ -973,16 +977,6 @@ ble_phy_rx_end_isr(void)
STATS_INC(ble_phy_stats, rx_hw_err);
ble_hdr->rxinfo.flags &= ~BLE_MBUF_HDR_F_CRC_OK;
}
-
- /*
- * XXX: This is a total hack work-around for now but I dont
- * know what else to do. If ENDCRYPT is not set and we are
- * encrypted we need to not trust this frame and drop it.
- */
- if (NRF_CCM_NS->EVENTS_ENDCRYPT == 0) {
- STATS_INC(ble_phy_stats, rx_hw_err);
- ble_hdr->rxinfo.flags &= ~BLE_MBUF_HDR_F_CRC_OK;
- }
}
#endif
}