mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-30 06:24:20 +01:00
Merge remote-tracking branch 'public/pr/1187' into mbedtls-2.1
* public/pr/1187: Fix build error with gcc -Werror=misleading-indentation
This commit is contained in:
commit
d1ededf4a3
@ -502,14 +502,14 @@ int mbedtls_x509_crl_parse( mbedtls_x509_crl *chain, const unsigned char *buf, s
|
|||||||
{
|
{
|
||||||
mbedtls_pem_init( &pem );
|
mbedtls_pem_init( &pem );
|
||||||
|
|
||||||
/* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
|
/* Avoid calling mbedtls_pem_read_buffer() on non-null-terminated string */
|
||||||
if( buflen == 0 || buf[buflen - 1] != '\0' )
|
if( buflen == 0 || buf[buflen - 1] != '\0' )
|
||||||
ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
|
ret = MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT;
|
||||||
else
|
else
|
||||||
ret = mbedtls_pem_read_buffer( &pem,
|
ret = mbedtls_pem_read_buffer( &pem,
|
||||||
"-----BEGIN X509 CRL-----",
|
"-----BEGIN X509 CRL-----",
|
||||||
"-----END X509 CRL-----",
|
"-----END X509 CRL-----",
|
||||||
buf, NULL, 0, &use_len );
|
buf, NULL, 0, &use_len );
|
||||||
|
|
||||||
if( ret == 0 )
|
if( ret == 0 )
|
||||||
{
|
{
|
||||||
@ -522,7 +522,7 @@ int mbedtls_x509_crl_parse( mbedtls_x509_crl *chain, const unsigned char *buf, s
|
|||||||
buf += use_len;
|
buf += use_len;
|
||||||
|
|
||||||
if( ( ret = mbedtls_x509_crl_parse_der( chain,
|
if( ( ret = mbedtls_x509_crl_parse_der( chain,
|
||||||
pem.buf, pem.buflen ) ) != 0 )
|
pem.buf, pem.buflen ) ) != 0 )
|
||||||
{
|
{
|
||||||
mbedtls_pem_free( &pem );
|
mbedtls_pem_free( &pem );
|
||||||
return( ret );
|
return( ret );
|
||||||
|
Loading…
Reference in New Issue
Block a user