Skip to content

Backport tfm 2 3 #44

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

Open
Vge0rge wants to merge 2 commits into
base: ncs-v3.4-branch
Choose a base branch
from
Open

Backport tfm 2 3 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
433c9be
[nrf toup] Add PSA_ALG_IS_SP800_108_COUNTER_CMAC macro
Vge0rge May 23, 2026
4f3edec
[nrf noup] Allow CMAC key type to be used with CMAC key derivation
Vge0rge May 28, 2026
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
5 changes: 5 additions & 0 deletions core/psa_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,11 @@ static int psa_key_algorithm_permits(psa_key_type_t key_type,
requested_output_length;
}
}

if (policy_alg == PSA_ALG_CMAC && requested_alg == PSA_ALG_SP800_108_COUNTER_CMAC) {
return 1;
}

/* If policy_alg is a generic key agreement operation, then using it for
* a key derivation with that key agreement should also be allowed. This
* behaviour is expected to be defined in a future specification version. */
Expand Down
12 changes: 12 additions & 0 deletions include/psa/crypto_values.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2301,6 +2301,18 @@
*/
#define PSA_ALG_SP800_108_COUNTER_CMAC ((psa_algorithm_t) 0x08000800)

/** Whether the specified algorithm is a key derivation algorithm constructed
* using #PSA_ALG_SP800_108_COUNTER_CMAC.
*
* \param alg An algorithm identifier (value of type #psa_algorithm_t).
*
* \return 1 if \p alg is a key derivation algorithm constructed using #PSA_ALG_SP800_108_COUNTER_CMAC(),
* 0 otherwise. This macro may return either 0 or 1 if \c alg is not a supported
* key derivation algorithm identifier.
*/
#define PSA_ALG_IS_SP800_108_COUNTER_CMAC(alg) \
((alg) == PSA_ALG_SP800_108_COUNTER_CMAC)

#define PSA_ALG_SRP_PASSWORD_HASH_BASE ((psa_algorithm_t) 0x08800300)
/** The SRP password to password-hash KDF.
* It takes the password p, the salt s, and the user id u.
Expand Down
Loading