mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-25 07:25:39 +00:00
x509: remove unnecessary calls to psa_hash_abort
According to the documentation, it does not need to be called after a failed psa_hash call.
This commit is contained in:
parent
78276b1c73
commit
593fccdf97
|
@ -1917,14 +1917,12 @@ static int x509_crt_check_signature( const mbedtls_x509_crt *child,
|
||||||
if( psa_hash_update( &hash_operation, child->tbs.p, child->tbs.len )
|
if( psa_hash_update( &hash_operation, child->tbs.p, child->tbs.len )
|
||||||
!= PSA_SUCCESS )
|
!= PSA_SUCCESS )
|
||||||
{
|
{
|
||||||
psa_hash_abort( &hash_operation );
|
|
||||||
return( -1 );
|
return( -1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
if( psa_hash_finish( &hash_operation, hash, sizeof( hash ), &hash_len )
|
if( psa_hash_finish( &hash_operation, hash, sizeof( hash ), &hash_len )
|
||||||
!= PSA_SUCCESS )
|
!= PSA_SUCCESS )
|
||||||
{
|
{
|
||||||
psa_hash_abort( &hash_operation );
|
|
||||||
return( -1 );
|
return( -1 );
|
||||||
}
|
}
|
||||||
#endif /* MBEDTLS_USE_PSA_CRYPTO */
|
#endif /* MBEDTLS_USE_PSA_CRYPTO */
|
||||||
|
|
|
@ -202,15 +202,12 @@ int mbedtls_x509write_csr_der( mbedtls_x509write_csr *ctx, unsigned char *buf, s
|
||||||
if( psa_hash_setup( &hash_operation, hash_alg ) != PSA_SUCCESS )
|
if( psa_hash_setup( &hash_operation, hash_alg ) != PSA_SUCCESS )
|
||||||
return( MBEDTLS_ERR_X509_FATAL_ERROR );
|
return( MBEDTLS_ERR_X509_FATAL_ERROR );
|
||||||
|
|
||||||
if( psa_hash_update( &hash_operation, c, len) != PSA_SUCCESS )
|
if( psa_hash_update( &hash_operation, c, len ) != PSA_SUCCESS )
|
||||||
{
|
|
||||||
psa_hash_abort( &hash_operation );
|
|
||||||
return( MBEDTLS_ERR_X509_FATAL_ERROR );
|
return( MBEDTLS_ERR_X509_FATAL_ERROR );
|
||||||
}
|
|
||||||
if( psa_hash_finish( &hash_operation, hash, sizeof( hash ), &hash_len )
|
if( psa_hash_finish( &hash_operation, hash, sizeof( hash ), &hash_len )
|
||||||
!= PSA_SUCCESS )
|
!= PSA_SUCCESS )
|
||||||
{
|
{
|
||||||
psa_hash_abort( &hash_operation );
|
|
||||||
return( MBEDTLS_ERR_X509_FATAL_ERROR );
|
return( MBEDTLS_ERR_X509_FATAL_ERROR );
|
||||||
}
|
}
|
||||||
#else /* MBEDTLS_USE_PSA_CRYPTO */
|
#else /* MBEDTLS_USE_PSA_CRYPTO */
|
||||||
|
|
Loading…
Reference in a new issue