Merge 3031a8a9ae9904b68f1daae1dcfd75c1571463dc into 03e1438089654fb884ac48e0f3cd0049cfe2c102

This commit is contained in:
Thomas du Boisrouvray 2026-10-27 10:46:15 -04:00 committed by GitHub
commit ac647678e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions

View File

@ -0,0 +1,3 @@
Bugfix
* Fix an unused-function warning in x509_oid.c when MBEDTLS_X509_USE_C
is disabled.

View File

@ -478,15 +478,17 @@ static const oid_sig_alg_t oid_sig_alg[] =
}, },
}; };
#if defined(MBEDTLS_X509_USE_C)
FN_OID_TYPED_FROM_ASN1(oid_sig_alg_t, sig_alg, oid_sig_alg) FN_OID_TYPED_FROM_ASN1(oid_sig_alg_t, sig_alg, oid_sig_alg)
#if defined(MBEDTLS_X509_USE_C) && !defined(MBEDTLS_X509_REMOVE_INFO) #if !defined(MBEDTLS_X509_REMOVE_INFO)
FN_OID_GET_DESCRIPTOR_ATTR1(mbedtls_x509_oid_get_sig_alg_desc, FN_OID_GET_DESCRIPTOR_ATTR1(mbedtls_x509_oid_get_sig_alg_desc,
oid_sig_alg_t, oid_sig_alg_t,
sig_alg, sig_alg,
const char *, const char *,
description) description)
#endif /* MBEDTLS_X509_USE_C && !MBEDTLS_X509_REMOVE_INFO */ #endif /* !MBEDTLS_X509_REMOVE_INFO */
#endif /* MBEDTLS_X509_USE_C */
#if defined(MBEDTLS_X509_USE_C) #if defined(MBEDTLS_X509_USE_C)
FN_OID_GET_ATTR2(mbedtls_x509_oid_get_sig_alg, FN_OID_GET_ATTR2(mbedtls_x509_oid_get_sig_alg,