Skip to content
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.

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

Configurable Encryption permission for the SMP service and two other small changes #2034

Merged

Conversation

kapi-no
Copy link
Contributor

@kapi-no kapi-no commented Sep 20, 2024

Cannot be empty

@kapi-no kapi-no force-pushed the ncs_smp_gatt_perm_kconfigs_and_others branch from bccd2f2 to eb37640 Compare September 20, 2024 14:27
@kapi-no
Copy link
Contributor Author

kapi-no commented Sep 20, 2024

rebase

Copy link
Contributor

@nordicjm nordicjm left a comment

Choose a reason for hiding this comment

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

0ea8194 differs from upstream commit 8c0bc54

@kapi-no
Copy link
Contributor Author

kapi-no commented Sep 24, 2024

@nordicjm, yes, because it had an entry to migration guide 4.0 that does not exist for the current NCS synchronization point with Zephyr. This is [nrf fromtree] commit and will be replaced with the proper change in the next upmerge. Can you remove your NAK?

@nordicjm
Copy link
Contributor

@nordicjm, yes, because it had an entry to migration guide 4.0 that does not exist for the current NCS synchronization point with Zephyr. This is [nrf fromtree] commit and will be replaced with the proper change in the next upmerge. Can you remove your NAK?

Cannot and will not, this is against our rules for fromlist and fromtree, they must be atomic for the upstream PR/commit and apply cleanly, if they do not, they cannot be fromlist or fromtree

@kapi-no
Copy link
Contributor Author

kapi-no commented Sep 24, 2024

@carlescufi, could you advise us how to move forward?

@carlescufi
Copy link
Contributor

@carlescufi, could you advise us how to move forward?

Let's wait for the upmerge.

…ER_CONNECTION

Removed the experimental status from the BT_BONDABLE_PER_CONNECTION
Kconfig option used in the Bluetooth Host SMP layer. This feature
has been present in Zephyr for over a year without any issue reports
or API modifications.

Signed-off-by: Kamil Piszczek <[email protected]>
(cherry picked from commit a743dd6)
@kapi-no kapi-no force-pushed the ncs_smp_gatt_perm_kconfigs_and_others branch from eb37640 to 03bcfd7 Compare October 7, 2024 07:14
@kapi-no
Copy link
Contributor Author

kapi-no commented Oct 7, 2024

rebase no file diff changes

…RIZATION_CUSTOM

Removed the experimental status from the BT_GATT_AUTHORIZATION_CUSTOM
Kconfig option used in the Bluetooth Host GATT layer. This feature
has been present in Zephyr for almost a year without any issue reports
or API modifications.

Signed-off-by: Kamil Piszczek <[email protected]>
(cherry picked from commit f17431e)
…ssion levels

Added new Kconfigs for defining permission level of GATT
characteristics that are part of the Bluetooth SMP service in the
MCUmgr subsys.

Removed the CONFIG_MCUMGR_TRANSPORT_BT_AUTHEN as the new Kconfig
options are mutually exclusive and need to be groupa as the Kconfig
choice option.

Signed-off-by: Kamil Piszczek <[email protected]>
(cherry picked from commit 8c0bc54)
@kapi-no kapi-no force-pushed the ncs_smp_gatt_perm_kconfigs_and_others branch from 03bcfd7 to 87e72a1 Compare October 7, 2024 07:15
@kapi-no
Copy link
Contributor Author

kapi-no commented Oct 7, 2024

Re-applied cleanly the MCUmgr-related commit since upmerge made it possible

@kapi-no kapi-no requested a review from nordicjm October 7, 2024 07:17
@kapi-no kapi-no added this to the ncs-2.8.0 milestone Oct 7, 2024
@rlubos rlubos merged commit ea7e265 into nrfconnect:main Oct 8, 2024
19 of 20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants