Skip to content

psa_crypto.c: Fix ifdefs to avoid build warning#723

Merged
mpg merged 1 commit into
Mbed-TLS:developmentfrom
aescolar:hotfix_clang_upstream
Apr 9, 2026
Merged

psa_crypto.c: Fix ifdefs to avoid build warning#723
mpg merged 1 commit into
Mbed-TLS:developmentfrom
aescolar:hotfix_clang_upstream

Conversation

@aescolar
Copy link
Copy Markdown
Contributor

@aescolar aescolar commented Mar 21, 2026

Description

Add a couple of missing ifdefs to avoid having unreachable code with AT_LEAST_ONE_BUILTIN_KDF not defined, which otherwise causes a build warning with clang.

PR checklist

Add a couple of missing ifdefs to avoid having unreachable code with
AT_LEAST_ONE_BUILTIN_KDF not defined, which otherwise causes a build
warning with clang.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
@valeriosetti valeriosetti self-requested a review March 21, 2026 12:49
@valeriosetti valeriosetti added needs-review Every commit must be reviewed by at least two team members needs-reviewer This PR needs someone to pick it up for review priority-high High priority - will be reviewed soon size-xs Estimated task size: extra small (a few hours at most) needs-ci Needs to pass CI tests labels Mar 21, 2026
@valeriosetti
Copy link
Copy Markdown
Contributor

Adding some relevant details for the 2nd reviewer.

This is the PR in the Zephyr fork of TF-PSA-Crypto repo:
zephyrproject-rtos#2

This is the main Zephyr PR with a command on how to reproduce the issue:
zephyrproject-rtos/zephyr#105990

This is the log of the failure:
build.log

Copy link
Copy Markdown
Contributor

@valeriosetti valeriosetti left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@valeriosetti valeriosetti removed the needs-ci Needs to pass CI tests label Mar 23, 2026
@valeriosetti valeriosetti moved this to Triage in in Community Mar 23, 2026
@davidhorstmann-arm davidhorstmann-arm moved this from Triage in to Scoped in Community Mar 23, 2026
@mpg
Copy link
Copy Markdown
Contributor

mpg commented Mar 24, 2026

  • mbedtls 3.6 PR not required because: no changes

Really? I'm seeing the same function with the same structure in 3.6. Why wouldn't we want to backport those changes?

@mpg mpg added approved Design and code approved - may be waiting for CI or backports needs-backports Backports are missing or are pending review and approval. and removed needs-review Every commit must be reviewed by at least two team members needs-reviewer This PR needs someone to pick it up for review labels Mar 24, 2026
@mpg
Copy link
Copy Markdown
Contributor

mpg commented Mar 24, 2026

I'm applying "needs-backport" not as a way to insist this needs backports, but if it doesn't need backports, I think it needs a better justification why.

@valeriosetti
Copy link
Copy Markdown
Contributor

valeriosetti commented Apr 8, 2026

@mpg I've added backport PRs:

Minor note: I think we should add the tf-psa-crypto 1.1 PR in the description message template, isn't it? In case the answer to this is "yes" then here it is: #742

@valeriosetti
Copy link
Copy Markdown
Contributor

@mpg I've also added you as reviewer for this PR because I'm doing the backports and I cannot self-approve PRs

@mpg mpg added this pull request to the merge queue Apr 9, 2026
Merged via the queue into Mbed-TLS:development with commit 96f68c6 Apr 9, 2026
2 checks passed
@github-project-automation github-project-automation Bot moved this from Scoped to Done in Community Apr 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Design and code approved - may be waiting for CI or backports needs-backports Backports are missing or are pending review and approval. priority-high High priority - will be reviewed soon size-xs Estimated task size: extra small (a few hours at most)

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants