mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-10-28 18:07:34 +08:00
Merge 3031a8a9ae9904b68f1daae1dcfd75c1571463dc into 03e1438089654fb884ac48e0f3cd0049cfe2c102
This commit is contained in:
commit
ac647678e1
3
ChangeLog.d/x509-oid-sig-alg-guard.txt
Normal file
3
ChangeLog.d/x509-oid-sig-alg-guard.txt
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
Bugfix
|
||||||
|
* Fix an unused-function warning in x509_oid.c when MBEDTLS_X509_USE_C
|
||||||
|
is disabled.
|
||||||
@ -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,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user