coffee/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-10-30 19:07:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 9d91cf18755f813a41ee07fc68ee21f028c72b84 into 4fdb917aae2fb5876e04f88621630712a906a067

Browse Source
This commit is contained in:
lhuang04 2026-10-27 10:45:59 -04:00 committed by GitHub
commit dc49bbca95
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.d/pk_internal_wundef.txt Normal file
View File

@ -0,0 +1,4 @@
Bugfix
* library/pk_internal.h: Fix 'MBEDTLS_PSA_MAX_EC_PUBKEY_LENGTH' and
'MBEDTLS_PSA_MAX_EC_KEY_PAIR_LENGTH' are not defined errors when
building in a configuration that does not enable PSA.

8
library/pk_internal.h
View File

@ -61,13 +61,17 @@
#endif
#if defined(PK_EXPORT_KEYS_ON_THE_STACK)
/* We know for ECC, pubkey are longer than privkeys, but double check.
* Also, take the maximum size of legacy and PSA, as PSA might be disabled. */
/* Take the maximum size of legacy ECP and PSA EC sizes.
* PSA might be disabled, so guard the PSA-specific macros. */
#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
#define PK_EXPORT_KEY_STACK_BUFFER_SIZE MBEDTLS_PSA_MAX_EC_PUBKEY_LENGTH
#if PK_EXPORT_KEY_STACK_BUFFER_SIZE < MBEDTLS_PSA_MAX_EC_KEY_PAIR_LENGTH
#undef PK_EXPORT_KEY_STACK_BUFFER_SIZE
#define PK_EXPORT_KEY_STACK_BUFFER_SIZE MBEDTLS_PSA_MAX_EC_KEY_PAIR_LENGTH
#endif
#else
#define PK_EXPORT_KEY_STACK_BUFFER_SIZE 0
#endif /* MBEDTLS_PSA_CRYPTO_CLIENT */
#if PK_EXPORT_KEY_STACK_BUFFER_SIZE < MBEDTLS_ECP_MAX_BYTES
#undef PK_EXPORT_KEY_STACK_BUFFER_SIZE
#define PK_EXPORT_KEY_STACK_BUFFER_SIZE MBEDTLS_ECP_MAX_BYTES