yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-30 00:34:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

mbedtls_x509_crt_parse_der_with_ext_cb enhancement

Browse Source 
added make_copy parameter as suggested in
https://github.com/ARMmbed/mbedtls/pull/3243#discussion_r431233555

Co-authored-by: Gilles Peskine <gilles.peskine@arm.com>
Signed-off-by: Nicola Di Lieto <nicola.dilieto@gmail.com>
This commit is contained in:
Nicola Di Lieto 2020-05-28 09:18:42 +02:00
parent fae25a13d9
commit 4dbe5676af
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
include/mbedtls/x509_crt.h
View File

@ -330,30 +330,39 @@ typedef int (*mbedtls_x509_crt_ext_cb_t)( mbedtls_x509_crt const *crt,
const unsigned char *end ); const unsigned char *end );
/** /**
* \brief Parse a single DER formatted certificate and add it * \brief Parse a single DER formatted certificate and add it
* to the end of the provided chained list. * to the end of the provided chained list.
* *
* \param chain The pointer to the start of the CRT chain to attach to. * \param chain The pointer to the start of the CRT chain to attach to.
* When parsing the first CRT in a chain, this should point * When parsing the first CRT in a chain, this should point
* to an instance of ::mbedtls_x509_crt initialized through * to an instance of ::mbedtls_x509_crt initialized through
* mbedtls_x509_crt_init(). * mbedtls_x509_crt_init().
* \param buf The buffer holding the DER encoded certificate. * \param buf The buffer holding the DER encoded certificate.
* \param buflen The size in Bytes of \p buf. * \param buflen The size in Bytes of \p buf.
* \param cb A callback invoked for every unsupported certificate * \param make_copy When not zero this function makes an internal copy of the
* extension. * CRT buffer \p buf. In particular, \p buf may be destroyed
* or reused after this call returns.
* When zero this function avoids duplicating the CRT buffer
* by taking temporary ownership thereof until the CRT
* is destroyed (like mbedtls_x509_crt_parse_der_nocopy())
* \param cb A callback invoked for every unsupported certificate
* extension.
* *
* \note This call is functionally equivalent to * \note This call is functionally equivalent to
* mbedtls_x509_crt_parse_der(), but it calls the callback * mbedtls_x509_crt_parse_der(), and/or
* with every unsupported certificate extension. * mbedtls_x509_crt_parse_der_nocopy()
* The callback must return a negative error code if it * but it calls the callback with every unsupported
* does not know how to handle such an extension. * certificate extension.
* The callback must return a negative error code if it
* does not know how to handle such an extension.
* *
* \return \c 0 if successful. * \return \c 0 if successful.
* \return A negative error code on failure. * \return A negative error code on failure.
*/ */
int mbedtls_x509_crt_parse_der_with_ext_cb( mbedtls_x509_crt *chain, int mbedtls_x509_crt_parse_der_with_ext_cb( mbedtls_x509_crt *chain,
const unsigned char *buf, const unsigned char *buf,
size_t buflen, size_t buflen,
int no_copy,
mbedtls_x509_crt_ext_cb_t cb ); mbedtls_x509_crt_ext_cb_t cb );
/** /**

3
library/x509_crt.c
View File

@ -1392,9 +1392,10 @@ int mbedtls_x509_crt_parse_der_nocopy( mbedtls_x509_crt *chain,
int mbedtls_x509_crt_parse_der_with_ext_cb( mbedtls_x509_crt *chain, int mbedtls_x509_crt_parse_der_with_ext_cb( mbedtls_x509_crt *chain,
const unsigned char *buf, const unsigned char *buf,
size_t buflen, size_t buflen,
int make_copy,
mbedtls_x509_crt_ext_cb_t cb ) mbedtls_x509_crt_ext_cb_t cb )
{ {
return( mbedtls_x509_crt_parse_der_internal( chain, buf, buflen, 1, cb ) ); return( mbedtls_x509_crt_parse_der_internal( chain, buf, buflen, make_copy, cb ) );
} }
int mbedtls_x509_crt_parse_der( mbedtls_x509_crt *chain, int mbedtls_x509_crt_parse_der( mbedtls_x509_crt *chain,