yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-04-27 11:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow NULL pointer in mbedtls_x509_get_sig_alg if params not needed

Browse source 
Also, set `sig_opts` pointer to `NULL` if no signature algorithm
parameters are given (to reflect exactly that).
This commit is contained in:
Hanno Becker 2019-02-22 16:03:29 +00:00
parent c84fd1cd95
commit 1898b68f09
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
library/x509.c
View file

@ -811,9 +811,6 @@ int mbedtls_x509_get_sig_alg( const mbedtls_x509_buf *sig_oid, const mbedtls_x50
{ {
int ret; int ret;
if( *sig_opts != NULL )
return( MBEDTLS_ERR_X509_BAD_INPUT_DATA );
if( ( ret = mbedtls_oid_get_sig_alg( sig_oid, md_alg, pk_alg ) ) != 0 ) if( ( ret = mbedtls_oid_get_sig_alg( sig_oid, md_alg, pk_alg ) ) != 0 )
return( MBEDTLS_ERR_X509_UNKNOWN_SIG_ALG + ret ); return( MBEDTLS_ERR_X509_UNKNOWN_SIG_ALG + ret );
@ -836,7 +833,10 @@ int mbedtls_x509_get_sig_alg( const mbedtls_x509_buf *sig_oid, const mbedtls_x50
return( ret ); return( ret );
} }
if( sig_opts != NULL )
*sig_opts = (void *) pss_opts; *sig_opts = (void *) pss_opts;
else
mbedtls_free( pss_opts );
} }
else else
#endif /* MBEDTLS_X509_RSASSA_PSS_SUPPORT */ #endif /* MBEDTLS_X509_RSASSA_PSS_SUPPORT */
@ -845,6 +845,9 @@ int mbedtls_x509_get_sig_alg( const mbedtls_x509_buf *sig_oid, const mbedtls_x50
if( ( sig_params->tag != MBEDTLS_ASN1_NULL && sig_params->tag != 0 ) || if( ( sig_params->tag != MBEDTLS_ASN1_NULL && sig_params->tag != 0 ) ||
sig_params->len != 0 ) sig_params->len != 0 )
return( MBEDTLS_ERR_X509_INVALID_ALG ); return( MBEDTLS_ERR_X509_INVALID_ALG );
if( sig_opts != NULL )
*sig_opts = NULL;
} }
return( 0 ); return( 0 );