mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-10 13:14:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9219 from valeriosetti/backport-fix-psa-cmac

Browse Source 
[Backport 3.6] adjust_legacy_crypto: enable CIPHER_C when PSA CMAC is builtin
This commit is contained in:
Tom Cosgrove 2024-06-03 15:35:37 +00:00 committed by GitHub
commit 2eed2a0a43
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.d/fix-psa-cmac.txt Normal file
View File

@ -0,0 +1,4 @@
Bugfix
* Fix the build when MBEDTLS_PSA_CRYPTO_CONFIG is enabled and the built-in
CMAC is enabled, but no built-in unauthenticated cipher is enabled.
Fixes #9209.

3
include/mbedtls/config_adjust_legacy_crypto.h
View File

@ -58,7 +58,8 @@
defined(MBEDTLS_PSA_BUILTIN_ALG_ECB_NO_PADDING) || \
defined(MBEDTLS_PSA_BUILTIN_ALG_CBC_NO_PADDING) || \
defined(MBEDTLS_PSA_BUILTIN_ALG_CBC_PKCS7) || \
defined(MBEDTLS_PSA_BUILTIN_ALG_CCM_STAR_NO_TAG))
defined(MBEDTLS_PSA_BUILTIN_ALG_CCM_STAR_NO_TAG) || \
defined(MBEDTLS_PSA_BUILTIN_ALG_CMAC))
#define MBEDTLS_CIPHER_C
#endif