Bluetooth: Host: Cherry-picks #3531
Open
+48
−13
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
Nov 24, 2025
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#3531 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
HaavardRei
force-pushed
the
host_cherry_pick_24_11
branch
from
fd40393 to
40e7627
Compare
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
Nov 24, 2025
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#3531 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
HaavardRei
force-pushed
the
host_cherry_pick_24_11
branch
from
40e7627 to
e27fad9
Compare
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
Nov 25, 2025
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#3531 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
HaavardRei
force-pushed
the
host_cherry_pick_24_11
branch
from
e27fad9 to
b0253b0
Compare
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
Nov 25, 2025
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#3531 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
Contributor
Author
|
Migration guide is conflicting, will rebase once #3513 is merged. |
… peer" This reverts commit 4994883. Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
As of Core v6.2, the passkey entry pairing method for legacy pairing does no longer grant authenticated MITM protection. This commit updates `smp.c` accordingly to not grant the authenticated states when using legacy passkey entry pairing. Adds a check to make sure that bonds that have been stored persistently adheres to these changes. Bonds that have been generated using the legacy passkey entry pairing method will thus be downgraded from authenticated to unauthenticated when restored from storage. Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no> (cherry picked from commit 627b6e4dd72bf4481fa8ff7dfee8dbf38e5e934b) Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
Adds the `CONFIG_BT_SMP_LEGACY_PAIR_ONLY` Kconfig option to force devices to use legacy pairing. This has a dependency on `CONFIG_BT_TESTING` as it is only intended for testing purposes, and use of legacy pairing is discouraged. Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no> (cherry picked from commit 6bb0e982ad5452101b7b7cd34d152fd60c59e74f) Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
This commit adds a new Kconfig option by enabling which Host will keep bonding with the same Central instead of rejecting pairing. Brief implementation details: This implementation adds a new flag to bt_keys struct: BT_KEYS_ID_CONFLICT. The flag is set, when: - bonding with the same peer and conflict identified - when loading conflicting keys from persistent storage. When bonding and conflict is identified, the new keys aren't added to the Resolving List immediately. Instead, the old keys stay in the Resolving List. When start advertising, Host finds conflicting keys that are already added to the Resolving List and substitues them. If, however, there is another advertiser already started for the added keys, the new request is reject and advertising start function returns -EPERM. This is supported by Peripheral role only for now. Allow to use CONFIG_BT_ID_AUTO_SWAP_MATCHING_BONDS Kconfig option even if CONFIG_BT_PRIVACY is disabled. This is because CONFIG_BT_PRIVACY configures privacy of local device will still allows to resolve peer address. During pairing, peer device may send its Identity Address and IRK which then can be used for address resolution. This doesn't require CONFIG_BT_PRIVACY be enabled. Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no> (cherry picked from commit 8e030ea) (cherry picked from commit 72becd4) (cherry picked from commit 4994883)
HaavardRei
force-pushed
the
host_cherry_pick_24_11
branch
from
b0253b0 to
c268343
Compare
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
Nov 25, 2025
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#3531 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-picks two commits