Update nrfxlib to be compatible with jan.5 Zephyr #613

SebastianBoe · 2022-01-03T17:12:08Z

Changes required for compatibility with new Zephyr revision.

See commit messages for details

frkv

LGTM

tejlmand

lgtm.

minor nit noticed.

tejlmand · 2022-01-05T19:58:47Z

zboss/src/CMakeLists.txt

+# warning.
+zephyr_library_compile_options(-Wno-address-of-packed-member)
+
+


minor nit: why the extra empty line ?

Suggested change

Accidental.

Would prefer to not do any git paperwork for this, but will fix if I have to touch the code any way.

nrf_security/configs/legacy_crypto_config.h.template

lmaciejonczyk · 2022-01-17T15:09:22Z

From OpenThread perspective, what have changed and makes the build failure is:

missing MBEDTLS_SSL_EXPORT_KEYS in nrf-config.h
now CONFIG_MBEDTLS_SSL_PROTO_DTLS=y needs to be explicitly enabled
MBEDTLS_ENTROPY_C is disabled by default and cannot be y enabled because it's a promptless option

SebastianBoe · 2022-01-17T17:08:42Z

@lmaciejonczyk : I believe MBEDTLS_SSL_EXPORT_KEYS has been fixed.

See 7142b6e#diff-5381c07ad9e799f8bbf6967323abc7876f592fd24f9dab1f93822531f7b0136bR1618

frkv · 2022-01-18T08:10:53Z

I would set the CONFIG_MBEDTLS_SSL_PROTO_DTLS either with a defconfig or by using the openthread security profile. Not everybody is using DTLS and it is uses more RAM and FLASH.

I don't know why you needed to set MBEDTLS_ENTROPY_C specifically. It is on a list of configurations that most likely will change due to PSA APIs becoming the standard one. If you are building with TF-M then the configuration is not applicable at all...

lmaciejonczyk · 2022-01-18T08:31:12Z

@lmaciejonczyk : I believe MBEDTLS_SSL_EXPORT_KEYS has been fixed.

See 7142b6e#diff-5381c07ad9e799f8bbf6967323abc7876f592fd24f9dab1f93822531f7b0136bR1618

I believe we are still missing:
kconfig_check_and_set_base(MBEDTLS_SSL_EXPORT_KEYS) in legacy_crypto_config.cmake

SebastianBoe · 2022-01-18T08:45:50Z

@lmaciejonczyk :

I believe we are still missing:
kconfig_check_and_set_base(MBEDTLS_SSL_EXPORT_KEYS) in legacy_crypto_config.cmake

I've now pushed this patch, good catch.

lmaciejonczyk · 2022-01-18T09:19:28Z

I don't know why you needed to set MBEDTLS_ENTROPY_C specifically. It is on a list of configurations that most likely will change due to PSA APIs becoming the standard one. If you are building with TF-M then the configuration is not applicable at all...

OpenThread currently uses MBEDTLS_ENTROPY_C related functions (mbedtls_entropy_init, mbedtls_entropy_func) for initializing random number generator.

frkv · 2022-01-18T10:22:58Z

I don't know why you needed to set MBEDTLS_ENTROPY_C specifically. It is on a list of configurations that most likely will change due to PSA APIs becoming the standard one. If you are building with TF-M then the configuration is not applicable at all...

OpenThread currently uses MBEDTLS_ENTROPY_C related functions (mbedtls_entropy_init, mbedtls_entropy_func) for initializing random number generator.

This topic will be handled in the meeting at 14.00

crypto/nrf_oberon/include/ocrypto_aes_ccm.h

crypto/nrf_oberon/include/ocrypto_curve_p224.h

crypto/nrf_oberon/include/ocrypto_ecdh_p256.h

crypto/nrf_oberon/include/ocrypto_rsa.h

power/reboot.h has been moved to sys/reboot.h. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>

nrfxlib/zboss/src/zcl/zcl_s_wwah.c and others are producing the warning -Waddress-of-packed-member. e.g. 650 | (req)->cluster_id = (zb_uint16_t*)(&(src_ptr->cluster_id)); ~^~~~~~~~~~~~~~~~~~~~~~~ It is suspected that this should be fixed in the source code. Until it is we temporarily suppress the warning. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>

-Adding library nrf_oberon v3.0.9 -Updating some APR.rst grouping NOTE: Not setting to use the new version as it is built against mbed TLS 3.0.0 which is incompatible for a some APIs Ref: NCSDK-13189 Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

-Added as single commit for easier readability, not made use of yet -Adding faux nrf_platform_cc3xx driver as well ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

-Added as single commit for easier readability, not made use of yet ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

-Added as single commit for easier readability, not made use of yet -Note that builtin driver is a "construct". Builtin in mbed TLS project is defacto SW implementation that is given as-is and is handled like a "fallback" and part of the core support. ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

-Added as single commit for easier readability -Not put in use yet ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

-Not in use yet, added as single commit for readability -This generates configurations for PSA APIs -Added CMake logic to convert Kconfigs to defines and to generate MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE -Added template file psa_crypto-config.h.template that is filled using #cmakedefine ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

-Not in use yet, added as single commit for readability -This generates configurations for legacy mbed TLS APIs -Added CMake logic to convert Kconfigs to defines and to generate MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE -Added template file legacy_crypto_config.h.template that is filled using #cmakedefine ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

-Not in use yet, added for better readability -Adds functionality to pass configurations to TF-M build ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

-Not in use yet. Added in single commit for readability -Adds Kconfig.legacy used for legacy mbed TLS configurations -Adds Kconfig.tls used for TLS/DTLS configurations ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

-Adds replacement of psa_crypto_driver_wrappers.c from mbed TLS -This implementation supports nrf_cc3xx and nrf_oberon -This file may be moved into sdk-mbedtls in due time ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no> Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>

-Implements mbedtls_psa_external_get_random which is used instead of using ctr_drbg.c or hmac_drbg.c -This uses nrf_cc3xx_platform_ctr_drbg API to generate random numbers ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no> Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>

-Adding support for mbed TLS 3.0.0 which includes -Some updated APIs in legacy mbed TLS -Adds the concept of PSA Crypto Drivers which we have implemented for nrf_cc3xx and nrf_oberon -Removed old "glue"-functionality. There is no longer any symbol manipulation and recombinations in libraries. -Kconfig refactoring: -Adding NRF_SECURITY config for PSA usage while NRF_SECURITY_BACKEND is prevent older code breaking. -Setting NORDIC_SECURITY_BACKEND enables legacy mbed TLS APIs -Removing glue/backend concepts -Refactoring PSA into Kconfig.psa -Make use of Kconfig.tls and Kconfig.legacy -Removal of macros in extensions: -Remove all functions used for stripping and gluing -General refactoring -Moving source-files to legacy folder ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

-As its own commit Ref: NCSDK-13189 Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

-Removed functionality to extract, rename and combine libraries used by the old glue-functionality -No longer needed ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

-Usable only in mbed TLS 2.x ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

fix docs Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>

Add workaround for liboberon PSA API prefix usage. When mbedcrypto has been compiled with a prefix for the PSA APIs. When building with TF-M the PSA APIs needs to be replaced with a prefix in order to separate it from the TF-M frontend versions of these APIs. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>

outdated

AndreyDodonov-EH · 2023-10-19T13:00:08Z

nrf_security/Kconfig.tls

+	int
+	range 0 16384
+	default 900 if OPENTHREAD_NRF_SECURITY
+	default 16380


This constant (16380) leads to mbedtls not working after this fix nrfconnect/sdk-mbedtls@668b31f

(unless of course server sends less)

Glad this config and wrong constant is removed altogether now.

But with SDK-NRF 2.4.2 it's not working...

SebastianBoe requested review from frkv and tejlmand as code owners January 3, 2022 17:12

SebastianBoe added the DNM Do not merge label Jan 3, 2022

github-actions bot mentioned this pull request Jan 3, 2022

Upmerge jan 5 nrfconnect/sdk-nrf#6461

Merged

frkv approved these changes Jan 4, 2022

View reviewed changes

SebastianBoe requested a review from tomchy as a code owner January 4, 2022 09:52

SebastianBoe changed the title ~~crypto: Port to new power management API~~ Update nrfxlib to be compatible with jan.5 Zephyr Jan 4, 2022

tejlmand approved these changes Jan 5, 2022

View reviewed changes

github-actions bot mentioned this pull request Jan 11, 2022

Re build S1 instead of re linking. nrfconnect/sdk-nrf#6506

Closed

SebastianBoe force-pushed the zephyr_jan_5_upmerge branch from 3701558 to a4aef9f Compare January 12, 2022 17:36

github-actions bot mentioned this pull request Jan 13, 2022

modules: tfm: Fix tfm_hal_platform_init handling nrfconnect/sdk-nrf#6424

Closed

Vge0rge force-pushed the zephyr_jan_5_upmerge branch from c3ada8d to a4aef9f Compare January 13, 2022 14:06

github-actions bot added the doc-required PR must not be merged without tech writer approval. label Jan 15, 2022

github-actions bot mentioned this pull request Jan 15, 2022

Nrf security mbedtls 3.0.0 nrfconnect/sdk-nrf#6533

Closed

lmaciejonczyk previously requested changes Jan 17, 2022

View reviewed changes

nrf_security/configs/legacy_crypto_config.h.template Outdated Show resolved Hide resolved

SebastianBoe force-pushed the zephyr_jan_5_upmerge branch 4 times, most recently from b52b1d1 to c330404 Compare January 17, 2022 12:24

frkv requested a review from lmaciejonczyk January 18, 2022 08:14

tomchy approved these changes Jan 18, 2022

View reviewed changes

b-gent self-requested a review January 19, 2022 09:44

b-gent requested changes Jan 19, 2022

View reviewed changes

SebastianBoe force-pushed the zephyr_jan_5_upmerge branch 3 times, most recently from e05cdab to 768d0a3 Compare January 24, 2022 09:05

github-actions bot mentioned this pull request Jan 24, 2022

Quarantine nrfconnect/sdk-nrf#6619

Closed

SebastianBoe force-pushed the zephyr_jan_5_upmerge branch 2 times, most recently from 2efd76f to b144eb4 Compare January 25, 2022 11:08

crypto: Port to new power management API

a143758

power/reboot.h has been moved to sys/reboot.h. Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>

SebastianBoe force-pushed the zephyr_jan_5_upmerge branch from 650028a to 41877a4 Compare January 25, 2022 14:47

SebastianBoe and others added 18 commits January 26, 2022 11:32

nrf_security: Adding nrf_cc3xx PSA driver

1ed46a1

-Added as single commit for easier readability, not made use of yet -Adding faux nrf_platform_cc3xx driver as well ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

nrf_security: Adding nrf_oberon PSA driver

4d98f9f

-Added as single commit for easier readability, not made use of yet ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

nrf_security: Added CMake logic for handling supported drivers

ccbcdd1

-Added as single commit for easier readability -Not put in use yet ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

nrf_security: Added config_to_tf-m cmake script

7134861

-Not in use yet, added for better readability -Adds functionality to pass configurations to TF-M build ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

crypto: Removing nrf_oberon v3.0.8

49f715f

-As its own commit Ref: NCSDK-13189 Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

nrf_security: Removed unused cmake scripts

ae38a8f

-Removed functionality to extract, rename and combine libraries used by the old glue-functionality -No longer needed ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

nrf_security: Removed unused mbed TLS config template file

a14462f

-Usable only in mbed TLS 2.x ref: NCSDK-11689 Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

doc: nrf_security: Don't document the non-existent glue layer

b9a9461

fix docs Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>

SebastianBoe force-pushed the zephyr_jan_5_upmerge branch from 5de3817 to 7593d1e Compare January 26, 2022 10:33

SebastianBoe merged commit be4f031 into nrfconnect:main Jan 26, 2022

AndreyDodonov-EH reviewed Oct 19, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update nrfxlib to be compatible with jan.5 Zephyr #613

Update nrfxlib to be compatible with jan.5 Zephyr #613

SebastianBoe commented Jan 3, 2022 •

edited

Loading

frkv left a comment

tejlmand left a comment

tejlmand Jan 5, 2022

SebastianBoe Jan 6, 2022

lmaciejonczyk commented Jan 17, 2022 •

edited

Loading

SebastianBoe commented Jan 17, 2022

frkv commented Jan 18, 2022

lmaciejonczyk commented Jan 18, 2022

SebastianBoe commented Jan 18, 2022

lmaciejonczyk commented Jan 18, 2022 •

edited

Loading

frkv commented Jan 18, 2022

AndreyDodonov-EH Oct 19, 2023

		# warning.
		zephyr_library_compile_options(-Wno-address-of-packed-member)

Update nrfxlib to be compatible with jan.5 Zephyr #613

Update nrfxlib to be compatible with jan.5 Zephyr #613

Conversation

SebastianBoe commented Jan 3, 2022 • edited Loading

frkv left a comment

Choose a reason for hiding this comment

tejlmand left a comment

Choose a reason for hiding this comment

tejlmand Jan 5, 2022

Choose a reason for hiding this comment

SebastianBoe Jan 6, 2022

Choose a reason for hiding this comment

lmaciejonczyk commented Jan 17, 2022 • edited Loading

SebastianBoe commented Jan 17, 2022

frkv commented Jan 18, 2022

lmaciejonczyk commented Jan 18, 2022

SebastianBoe commented Jan 18, 2022

lmaciejonczyk commented Jan 18, 2022 • edited Loading

frkv commented Jan 18, 2022

AndreyDodonov-EH Oct 19, 2023

Choose a reason for hiding this comment

SebastianBoe commented Jan 3, 2022 •

edited

Loading

lmaciejonczyk commented Jan 17, 2022 •

edited

Loading

lmaciejonczyk commented Jan 18, 2022 •

edited

Loading