Skip to content

feat: improve pairing security requirements #573

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

Draft
Xavier Bernhardt (XavierBernhardt-Philips) wants to merge 18 commits into
base: main
Choose a base branch
from
Draft

feat: improve pairing security requirements #573

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
97b6319
Revert "fix: GPDMA channel abort sequence (#555)"
oguzcanoguz May 20, 2025
8bceda5
Initial commit; added descriptive comments to SecureConnection enum
XavierBernhardt-Philips May 28, 2025
11e4e76
Revert formatting in unrelated file
XavierBernhardt-Philips May 28, 2025
5ba8925
Merge remote-tracking branch 'origin/HEAD'
XavierBernhardt-Philips May 28, 2025
1fcda26
fix: in StBootloaderCommunicatorUart use different timeout for erasin…
richardapeters May 22, 2025
55deec3
Merge branch 'main' into feature/pairing-security-requirements
XavierBernhardt-Philips May 28, 2025
13ac267
fix: in StBootloaderCommunicatorUart use different timeout for erasin…
richardapeters May 22, 2025
627e934
Rewriting SetSecurityMode to SetSecurityRequirements; updated signature
XavierBernhardt-Philips May 28, 2025
3896f4b
Better enum naming for ConnectionMode and ManInTheMiddleMode
MiquelJayson-Philips Jun 6, 2025
8173e57
Renamed notRequired to Disabled
MiquelJayson-Philips Jun 6, 2025
c744c01
Rename values in SecureConnectionMode enum
MiquelJayson-Philips Jun 13, 2025
2f2cd52
Refactoring SecureConnectionMode and MITMMODE into 2 functions
XavierBernhardt-Philips Jun 16, 2025
f3780f5
fix compile errors
XavierBernhardt-Philips Jun 18, 2025
c4e625d
Removed todos
XavierBernhardt-Philips Jun 18, 2025
88b67ce
refactoring
XavierBernhardt-Philips Jun 18, 2025
e43b0be
Merge branch 'main' into feature/pairing-security-requirements
XavierBernhardt-Philips Jun 18, 2025
e05f5a5
Removed unnecessary headers and add SC ble defs
MiquelJayson-Philips Jun 19, 2025
7936cd2
Merge branch 'main' into feature/pairing-security-requirements
XavierBernhardt-Philips Jul 22, 2025
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
6 changes: 3 additions & 3 deletions hal_st/middlewares/ble_middleware/GapSt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ namespace hal

enum class SecureConnection : uint8_t
{
notSupported = 0,
optional = 1,
mandatory
notSupported = 0, // Legacy only
optional = 1, // Secure if available, otherwise Legacy
mandatory // Secure only
};

SecureConnection secureConnectionSupport = (level == services::GapPairing::SecurityLevel::level4) ? SecureConnection::mandatory : SecureConnection::optional;
Expand Down
45 changes: 21 additions & 24 deletions hal_st/stm32fxxx/DmaStm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,25 @@ namespace hal
std::array{ DMA2_Stream0_IRQn, DMA2_Stream1_IRQn, DMA2_Stream2_IRQn, DMA2_Stream3_IRQn, DMA2_Stream4_IRQn, DMA2_Stream5_IRQn, DMA2_Stream6_IRQn, DMA2_Stream7_IRQn },
};

const std::array dmaChannel{
const std::array dmaChannel
{
DMA_CHANNEL_0,
DMA_CHANNEL_1,
DMA_CHANNEL_2,
DMA_CHANNEL_3,
DMA_CHANNEL_4,
DMA_CHANNEL_5,
DMA_CHANNEL_6,
DMA_CHANNEL_7,
DMA_CHANNEL_1,
DMA_CHANNEL_2,
DMA_CHANNEL_3,
DMA_CHANNEL_4,
DMA_CHANNEL_5,
DMA_CHANNEL_6,
DMA_CHANNEL_7,
#if defined(DMA_CHANNEL_15)
DMA_CHANNEL_8,
DMA_CHANNEL_9,
DMA_CHANNEL_10,
DMA_CHANNEL_11,
DMA_CHANNEL_12,
DMA_CHANNEL_13,
DMA_CHANNEL_14,
DMA_CHANNEL_15,
DMA_CHANNEL_8,
DMA_CHANNEL_9,
DMA_CHANNEL_10,
DMA_CHANNEL_11,
DMA_CHANNEL_12,
DMA_CHANNEL_13,
DMA_CHANNEL_14,
DMA_CHANNEL_15,
#endif
};

Expand Down Expand Up @@ -577,15 +578,11 @@ namespace hal
{
auto streamRegister = DmaChannel[dmaIndex][streamIndex];
#ifdef GPDMA1
streamRegister->CCR |= DMA_CCR_SUSP;
if ((streamRegister->CCR & DMA_CCR_EN) == DMA_CCR_EN)
{
while ((streamRegister->CSR & DMA_CSR_SUSPF) == 0)
;
}
streamRegister->CCR |= DMA_CCR_RESET;
streamRegister->CCR |= (DMA_CCR_SUSP | DMA_CCR_RESET);
#endif
#if defined(DMA_SxCR_EN)
#if defined(DMA_CCR_EN)
streamRegister->CCR &= ~DMA_CCR_EN;
#else
streamRegister->CR &= ~DMA_SxCR_EN;
#endif
}
Expand Down
Loading