cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-09-28 07:51:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9463 from sezrab/psa_util_in_builds_without_psa-3.6

Browse Source 
[Backport 3.6] psa_util.c included in builds without PSA, which can break the build
This commit is contained in:
Manuel Pégourié-Gonnard 2024-08-14 07:16:13 +00:00 committed by GitHub
commit 70658db50a
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

5
ChangeLog.d/psa_util_in_builds_without_psa.txt Normal file
View File

@ -0,0 +1,5 @@
Bugfix
* When MBEDTLS_PSA_CRYPTO_C was disabled and MBEDTLS_ECDSA_C enabled,
some code was defining 0-size arrays, resulting in compilation errors.
Fixed by disabling the offending code in configurations without PSA
Crypto, where it never worked. Fixes #9311.

2
include/mbedtls/config_adjust_legacy_crypto.h
View File

@ -428,7 +428,7 @@
/* psa_util file features some ECDSA conversion functions, to convert between /* psa_util file features some ECDSA conversion functions, to convert between
* legacy's ASN.1 DER format and PSA's raw one. */ * legacy's ASN.1 DER format and PSA's raw one. */
#if defined(MBEDTLS_ECDSA_C) || (defined(MBEDTLS_PSA_CRYPTO_C) && \ #if (defined(MBEDTLS_PSA_CRYPTO_CLIENT) && \
(defined(PSA_WANT_ALG_ECDSA) || defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA))) (defined(PSA_WANT_ALG_ECDSA) || defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA)))
#define MBEDTLS_PSA_UTIL_HAVE_ECDSA #define MBEDTLS_PSA_UTIL_HAVE_ECDSA
#endif #endif