Skip to content

[zep fromlist] psa_crypto.c: Fix ifdefs to avoid build warning #2

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.

Sign up for GitHub

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

Merged
valeriosetti merged 1 commit into from
Mar 21, 2026
+4 −0
Merged

[zep fromlist] psa_crypto.c: Fix ifdefs to avoid build warning #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions core/psa_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6958,7 +6958,9 @@ static int psa_key_derivation_allows_free_form_secret_input(
psa_status_t psa_key_derivation_setup(psa_key_derivation_operation_t *operation,
psa_algorithm_t alg)
{
#if defined(AT_LEAST_ONE_BUILTIN_KDF)
psa_status_t status;
#endif

if (operation->alg != 0) {
return PSA_ERROR_BAD_STATE;
Expand Down Expand Up @@ -6991,10 +6993,12 @@ psa_status_t psa_key_derivation_setup(psa_key_derivation_operation_t *operation,
return PSA_ERROR_INVALID_ARGUMENT;
}

#if defined(AT_LEAST_ONE_BUILTIN_KDF)
if (status == PSA_SUCCESS) {
operation->alg = alg;
}
return status;
#endif /* AT_LEAST_ONE_BUILTIN_KDF */
}

#if defined(BUILTIN_ALG_ANY_HKDF)
Expand Down