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

Merge dbcbf281520597bba65a117d00889cb7bb93aacf into 03e1438089654fb884ac48e0f3cd0049cfe2c102

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

5
ChangeLog.d/fix-x509-profile-pk-sigalg.txt Normal file
View File

@ -0,0 +1,5 @@
Bugfix
* Fix X.509 certificate profile checks to correctly map internal PK types
to public signature algorithm identifiers. Previously, ECKEY certificates
were incorrectly rejected when MBEDTLS_PK_SIGALG_ECDSA was allowed in a
custom profile. Fixes #10849 and #10747.

20
library/x509_crt.c
View File

@ -181,6 +181,24 @@ int mbedtls_x509_profile_check_md_alg(const mbedtls_x509_crt_profile *profile,
return -1;
}
/*
* Map an internal pk_type to the public pk_sigalg_t used in profiles.
*
* This is needed because mbedtls_pk_type_t and mbedtls_pk_sigalg_t have
* different numerical values for the same logical algorithms.
*/
static mbedtls_pk_sigalg_t x509_pk_type_to_sigalg(mbedtls_pk_type_t pk_type)
{
switch (pk_type) {
case MBEDTLS_PK_RSA: return MBEDTLS_PK_SIGALG_RSA_PKCS1V15;
case MBEDTLS_PK_RSASSA_PSS: return MBEDTLS_PK_SIGALG_RSA_PSS;
case MBEDTLS_PK_ECKEY:
case MBEDTLS_PK_ECKEY_DH:
case MBEDTLS_PK_ECDSA: return MBEDTLS_PK_SIGALG_ECDSA;
default: return MBEDTLS_PK_SIGALG_NONE;
}
}
int mbedtls_x509_profile_check_pk_alg(const mbedtls_x509_crt_profile *profile,
mbedtls_pk_sigalg_t pk_alg)
{
@ -3074,7 +3092,7 @@ static int x509_crt_verify_restartable_ca_cb(mbedtls_x509_crt *crt,
/* Check the type and size of the key */
pk_type = mbedtls_pk_get_type(&crt->pk);
if (mbedtls_x509_profile_check_pk_alg(profile, (mbedtls_pk_sigalg_t) pk_type) != 0) {
if (mbedtls_x509_profile_check_pk_alg(profile, x509_pk_type_to_sigalg(pk_type)) != 0) {
ee_flags |= MBEDTLS_X509_BADCERT_BAD_PK;
}

8
tests/suites/test_suite_x509parse.data
View File

@ -2768,6 +2768,10 @@ X509 CRT verify chain #25 (len=3, vrfy fatal on depth 3, untrusted)
depends_on:PSA_WANT_ALG_SHA_256:PSA_HAVE_ALG_ECDSA_VERIFY:PSA_WANT_ECC_SECP_R1_256:PSA_HAVE_ALG_SOME_RSA_VERIFY:PSA_WANT_ALG_SHA_1:PSA_WANT_ECC_SECP_R1_384
mbedtls_x509_crt_verify_chain:"../framework/data_files/server10_int3_int-ca2_ca.crt":"../framework/data_files/test-ca2.crt":-1:-4:"":8
X509 CRT verify chain #26 (ECDSA-only profile, EC self-signed cert)
depends_on:PSA_WANT_ALG_SHA_256:PSA_HAVE_ALG_ECDSA_VERIFY:PSA_WANT_ECC_SECP_R1_256
mbedtls_x509_crt_verify_chain:"../framework/data_files/server5-selfsigned.crt":"../framework/data_files/server5-selfsigned.crt":0:0:"ecdsa_only":0
X509 OID description #1
x509_oid_desc:"2b06010505070301":"TLS Web Server Authentication"
@ -3559,3 +3563,7 @@ oid_get_numeric_string:"8001":MBEDTLS_ERR_ASN1_INVALID_DATA:""
OID get numeric string - overlong encoding, second subidentifier
oid_get_numeric_string:"2B8001":MBEDTLS_ERR_ASN1_INVALID_DATA:""
X509 CRT verify chain #18 (ECDSA-only profile, EC self-signed cert)
depends_on:PSA_WANT_ALG_SHA_256:PSA_HAVE_ALG_ECDSA_VERIFY:PSA_WANT_ECC_SECP_R1_256
mbedtls_x509_crt_verify_chain:"../framework/data_files/server5-selfsigned.crt":"../framework/data_files/server5-selfsigned.crt":0:0:"ecdsa_only":0

10
tests/suites/test_suite_x509parse.function
View File

@ -58,6 +58,14 @@ const mbedtls_x509_crt_profile profile_rsa3072 =
3072,
};
const mbedtls_x509_crt_profile profile_ecdsa_only =
{
0xFFFFFFFF, /* Any MD */
MBEDTLS_X509_ID_FLAG(MBEDTLS_PK_SIGALG_ECDSA),
0xFFFFFFFF, /* Any curve */
1024,
};
const mbedtls_x509_crt_profile profile_sha512 =
{
MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA512),
@ -1533,6 +1541,8 @@ void mbedtls_x509_crt_verify_chain(char *chain_paths, char *trusted_ca,
profile = &profile_rsa3072;
} else if (strcmp(profile_name, "sha512") == 0) {
profile = &profile_sha512;
} else if (strcmp(profile_name, "ecdsa_only") == 0) {
profile = &profile_ecdsa_only;
}
res = mbedtls_x509_crt_verify_with_profile(&chain, &trusted, NULL, profile,