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

nrf_security: Move PSA_WANT symbols from Zephyr to nrf_security #17724

Merged
merged 4 commits into from
Oct 23, 2024

Conversation

Vge0rge
Copy link
Contributor

@Vge0rge Vge0rge commented Oct 8, 2024

The Nordic only PSA_WANT symbols make more sense to be placed here instead of adding a noup commit in Zephyr

@Vge0rge Vge0rge requested review from a team as code owners October 8, 2024 08:55
@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Oct 8, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 8, 2024

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
zephyr nrfconnect/sdk-zephyr@8ceab93 nrfconnect/sdk-zephyr@be00e5a (main) nrfconnect/[email protected]

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 8, 2024

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 21

Inputs:

Sources:

sdk-nrf: PR head: 3d032b93f2ee10e39f5430e6678c69b3a96551cd
zephyr: PR head: be00e5a236d2cd71583a36e4c93cb3400a2faff0

more details

sdk-nrf:

PR head: 3d032b93f2ee10e39f5430e6678c69b3a96551cd
merge base: 6cb02b2c5efdff94b3615dcc18ef20e0f6f266cd
target head (main): 6cb02b2c5efdff94b3615dcc18ef20e0f6f266cd
Diff

zephyr:

PR head: be00e5a236d2cd71583a36e4c93cb3400a2faff0
merge base: 8ceab93c866d584201621703dee15a77107e7363
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (27)
doc
│  ├── nrf
│  │  ├── libraries
│  │  │  ├── security
│  │  │  │  ├── nrf_security
│  │  │  │  │  ├── doc
│  │  │  │  │  │  │ driver_config.rst
│  │  ├── releases_and_maturity
│  │  │  ├── releases
│  │  │  │  │ release-notes-changelog.rst
subsys
│  ├── nrf_security
│  │  ├── Kconfig
│  │  ├── Kconfig.psa.nordic
│  │  ├── src
│  │  │  ├── drivers
│  │  │  │  ├── Kconfig
│  │  │  │  ├── cracen
│  │  │  │  │  ├── cracenpsa
│  │  │  │  │  │  ├── src
│  │  │  │  │  │  │  │ blkcipher.c
│  │  │  │  │  ├── psa_driver.Kconfig
│  │  │  │  │  ├── sxsymcrypt
│  │  │  │  │  │  ├── include
│  │  │  │  │  │  │  ├── sxsymcrypt
│  │  │  │  │  │  │  │  ├── aes.h
│  │  │  │  │  │  │  │  │ blkcipher.h
│  │  │  │  │  │  ├── src
│  │  │  │  │  │  │  ├── blkcipher.c
│  │  │  │  │  │  │  │ blkcipherdefs.h
│  │  │  │  ├── nrf_cc3xx
│  │  │  │  │  │ Kconfig
west.yml
zephyr
│  ├── drivers
│  │  ├── audio
│  │  │  ├── Kconfig.dmic_pdm_nrfx
│  │  │  │ dmic_nrfx_pdm.c
│  ├── modules
│  │  ├── hal_nordic
│  │  │  ├── nrfx
│  │  │  │  ├── Kconfig
│  │  │  │  ├── nrfx_config.h
│  │  │  │  ├── nrfx_config_common.h
│  │  │  │  │ nrfx_config_nrf5340_application.h
│  │  ├── mbedtls
│  │  │  ├── Kconfig
│  │  │  │ Kconfig.psa.nordic
│  ├── samples
│  │  ├── drivers
│  │  │  ├── audio
│  │  │  │  ├── dmic
│  │  │  │  │  ├── boards
│  │  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.overlay
│  │  │  │  │  │ sample.yaml
│  ├── soc
│  │  ├── nordic
│  │  │  ├── common
│  │  │  │  │ Kconfig.peripherals
│  │  │  │ validate_base_addresses.c
│  ├── subsys
│  │  ├── dfu
│  │  │  ├── Kconfig
│  │  │  ├── img_util
│  │  │  │  │ flash_img.c

Outputs:

Toolchain

Version: 3dd8985b56
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:3dd8985b56_912848a074

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 1692
    • sdk-zephyr test count: 6259
  • ❌ Integration tests
    • ✅ test-sdk-audio
    • ✅ test-fw-nrfconnect-boot
    • ✅ test-fw-nrfconnect-chip
    • ✅ test-fw-nrfconnect-nfc
    • ✅ test-fw-nrfconnect-nrf-iot_cloud
    • ✅ test-fw-nrfconnect-nrf-iot_thingy91
    • ✅ test-fw-nrfconnect-nrf_crypto
    • ✅ test-fw-nrfconnect-rs
    • ✅ test-fw-nrfconnect-fem
    • ✅ test-fw-nrfconnect-tfm
    • ✅ test-fw-nrfconnect-thread
    • ✅ test-fw-nrfconnect-zigbee
    • ❌ test-sdk-find-my
    • ✅ test-sdk-sidewalk
    • ✅ test-low-level
    • ✅ test-sdk-mcuboot
    • ❌ test-sdk-dfu
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_nrf_provisioning
    • test-fw-nrfconnect-nrf-iot_positioning
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-proprietary_esb
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-sdk-pmic-samples
    • test-sdk-wifi

Note: This message is automatically posted and updated by the CI

@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

@tejlmand
Copy link
Contributor

tejlmand commented Oct 8, 2024

same question goes for this commit: nrfconnect/sdk-zephyr@0892bad

why are we having this as a noup instead of keeping it downstream ?

Copy link
Contributor

@frkv frkv left a comment

Choose a reason for hiding this comment

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

LGTM (minus removal of CFB and OFB which we don't want to continue supporting)

@Vge0rge Vge0rge requested a review from a team as a code owner October 15, 2024 11:53
@Vge0rge Vge0rge force-pushed the move_psa_wants branch 3 times, most recently from a747da4 to c6fd0f5 Compare October 15, 2024 12:04
Copy link
Contributor

@frkv frkv left a comment

Choose a reason for hiding this comment

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

LGTM (pending correct SHA and green CI)

@Vge0rge Vge0rge changed the title nrf_security: Move PSA_WANT symbols to Zephyr nrf_security: Move PSA_WANT symbols from Zephyr to nrf_secuerity Oct 15, 2024
@Vge0rge Vge0rge changed the title nrf_security: Move PSA_WANT symbols from Zephyr to nrf_secuerity nrf_security: Move PSA_WANT symbols from Zephyr to nrf_security Oct 15, 2024
Copy link
Contributor

@tomi-font tomi-font left a comment

Choose a reason for hiding this comment

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

Nice little cleanup. (Two tiny remarks, do what you want with them.)
I'm thinking, regarding CFB and OFB removal, maybe this also requires some update to the following files?

  • doc/nrf/libraries/security/nrf_security/doc/driver_config.rst
  • subsys/nrf_security/src/drivers/Kconfig.psa_accel
  • subsys/nrf_security/include/psa/core_unsupported_ciphers_check.h

subsys/nrf_security/Kconfig Outdated Show resolved Hide resolved
subsys/nrf_security/Kconfig.psa.nordic Outdated Show resolved Hide resolved
@github-actions github-actions bot added the doc-required PR must not be merged without tech writer approval. label Oct 15, 2024
@tomi-font tomi-font requested a review from mia-ko October 15, 2024 13:45
@Vge0rge Vge0rge requested a review from a team as a code owner October 16, 2024 14:12
@Vge0rge Vge0rge force-pushed the move_psa_wants branch 3 times, most recently from 4ccb222 to 9c2feee Compare October 21, 2024 08:50
@Vge0rge Vge0rge removed the doc-required PR must not be merged without tech writer approval. label Oct 21, 2024
@Vge0rge Vge0rge removed the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Oct 21, 2024
@github-actions github-actions bot added doc-required PR must not be merged without tech writer approval. changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Oct 21, 2024
@Vge0rge Vge0rge removed doc-required PR must not be merged without tech writer approval. changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Oct 22, 2024
@Vge0rge
Copy link
Contributor Author

Vge0rge commented Oct 22, 2024

@nrfconnect/ncs-co-build-system @nrfconnect/ncs-code-owners @nrfconnect/ncs-aegir-doc please review

Copy link
Contributor

@mia-ko mia-ko left a comment

Choose a reason for hiding this comment

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

These are just removed from the rst file, so it's all good from the doc perspective, except from a missing changelog entry.

@Vge0rge Vge0rge requested a review from a team as a code owner October 22, 2024 08:36
@github-actions github-actions bot added the doc-required PR must not be merged without tech writer approval. label Oct 22, 2024
@Vge0rge
Copy link
Contributor Author

Vge0rge commented Oct 22, 2024

These are just removed from the rst file, so it's all good from the doc perspective, except from a missing changelog entry.

Added something there.

The Nordic only PSA_WANTs are moved from Zephyr
to nrf_security to reduce the noup commits in
sdk-zephyr.

Signed-off-by: Georgios Vasilakis <[email protected]>
To avoid noup commits in Zephyr.

Signed-off-by: Georgios Vasilakis <[email protected]>
Move some PSA_WANTs from the drivers Kconfig in nrf_security
to the Kconfig file which contains the rest of the PSA_WANT
configurations.

During the upmerge support for OFB and CFB modes of AES
was removed so here we remove the relevant code in the drivers
as well.

Signed-off-by: Georgios Vasilakis <[email protected]>
Add a changelog entry to make it visible that the ciphers
OFB and CFB from PSA are no longer supported.

Signed-off-by: Georgios Vasilakis <[email protected]>
@rlubos rlubos merged commit b40284b into nrfconnect:main Oct 23, 2024
12 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
doc-required PR must not be merged without tech writer approval. manifest manifest-zephyr
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants