Skip to content

Conversation

@m-alperen-sener
Copy link
Contributor

Cherry-pick for deprecating fixed passkey.

* pairing, or BT_PASSKEY_RAND to generate a random passkey. This callback is invoked only
* for the Passkey Entry method as defined in Core Specification Vol. 3, Part H. Which
* device in the pairing is showing the passkey depends on the IO capabilities of the
* device; see Table 2.8 of the Bluetooth Core Specification V6.0, Vol. 3, Part H for more
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better not to specify version, so we don't need to update it with every spec release. The way core spec is developed guarantees that existing section numbers will not change in future specs.

Suggested change
* device; see Table 2.8 of the Bluetooth Core Specification V6.0, Vol. 3, Part H for more
* device; see Table 2.8 of the Bluetooth Core Specification, Vol. 3, Part H for more

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should I do it here? I don't know actually since this is upstream commit? any suggestion?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is better to fix this in upstream instead of noup here.

@m-alperen-sener m-alperen-sener force-pushed the fixed_passkey_derecation branch 7 times, most recently from 604af05 to 800163b Compare November 13, 2025 14:39
@m-alperen-sener m-alperen-sener force-pushed the fixed_passkey_derecation branch 2 times, most recently from 0f113a4 to d64d4dd Compare November 18, 2025 15:06
Copy link
Contributor

@rlubos rlubos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nrf noup] Revert "[nrf fromtree] bluetooth: mesh: use new Kconfig CONFIG_PSA_CRYPTO"

Please use the default revert title (Revert "[nrf fromtree] bluetooth: mesh: use new Kconfig CONFIG_PSA_CRYPTO"), no sauce tags, otherwise our tooling will get confused.

@m-alperen-sener m-alperen-sener force-pushed the fixed_passkey_derecation branch from d64d4dd to 6f5f768 Compare November 19, 2025 11:48
@m-alperen-sener
Copy link
Contributor Author

m-alperen-sener commented Nov 19, 2025

[nrf noup] Revert "[nrf fromtree] bluetooth: mesh: use new Kconfig CONFIG_PSA_CRYPTO"

Please use the default revert title (Revert "[nrf fromtree] bluetooth: mesh: use new Kconfig CONFIG_PSA_CRYPTO"), no sauce tags, otherwise our tooling will get confused.

This https://github.com/nrfconnect/sdk-zephyr/actions/runs/19500260647/job/55812322763?pr=3466 was the reason I added noup to because what happens is:

I need commits:

a46c319

f4636a2

f1bfe38

But a46c319 picks up some piece of change from this 90036ce commit so it fails because it has a conflict, so I pick it too, to have a smooth cherry-pick without conflict, then at the end I revert it but revert also comes in with a conflict. To hide the conflict I added [nrf noup].

I don't know what am I supposed to do, cherry-pick all dependencies and fight, how deep should I dig?

@m-alperen-sener m-alperen-sener force-pushed the fixed_passkey_derecation branch from 6f5f768 to 1fbe278 Compare November 19, 2025 13:07
@m-alperen-sener
Copy link
Contributor Author

m-alperen-sener commented Nov 19, 2025

I have removed 90036ce. This commit needs quite a work it seems. But it will cause conflict and unfortunately I have applied the cheery-pick by resolving conflict manually.

So can we merge this PR as is. 90036ce will not come downstream anytime soon.

@PavelVPV
Copy link
Contributor

I have removed 90036ce. This commit needs quite a work it seems. But it will cause conflict and unfortunately I have applied the cheery-pick by resolving conflict manually.

So can we merge this PR as is. 90036ce will not come downstream anytime soon.

This commit is cherry-picked in this PR: #3431 but also have some problems in passing CI.

@rlubos
Copy link
Contributor

rlubos commented Nov 19, 2025

@carlescufi Ok to override the CI for this particular case? The conflict was just a migration guide entry.

@m-alperen-sener m-alperen-sener force-pushed the fixed_passkey_derecation branch from 1fbe278 to 86a13c4 Compare November 20, 2025 12:31
Adds the BT_APP_PASSKEY Kconfig, which allows the application to provide
passkeys for pairing using the new `app_passkey()` callback.
This is an alternative to BT_FIXED_PASSKEY, which will be deprecated in
a later commit.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 6c64054)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
The BT_FIXED_PASSKEY Kconfig option is being deprecated, and is replaced
by BT_APP_PASSKEY. The reason for the deprecation is an upcoming
errata, ES-24489, which mandates that a new passkey shall be generated
for each pairing procedure.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit 82cfb5a)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
Updates the bt shell API to use the new Kconfig option
BT_APP_PASSKEY instead of BT_FIXED_PASSKEY as this is being
deprecated.

Signed-off-by: Håvard Reierstad <haavard.reierstad@nordicsemi.no>
(cherry picked from commit b6252b5)
Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
@m-alperen-sener m-alperen-sener force-pushed the fixed_passkey_derecation branch from 86a13c4 to 2d079a1 Compare November 20, 2025 15:27
@m-alperen-sener
Copy link
Contributor Author

We can merge this now, manifest PR is green.

@rlubos rlubos merged commit d54a7f8 into nrfconnect:main Nov 21, 2025
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants