mirror of
https://github.com/yuzu-emu/mbedtls
synced 2024-11-24 18:58:32 +00:00
Fix some return values
This commit is contained in:
parent
76c18a1a77
commit
583b608401
4 changed files with 18 additions and 12 deletions
|
@ -141,8 +141,8 @@ static int eckey_verify_wrap( void *ctx, md_type_t md_alg,
|
|||
|
||||
ecdsa_init( &ecdsa );
|
||||
|
||||
ret = ecdsa_from_keypair( &ecdsa, ctx ) ||
|
||||
ecdsa_verify_wrap( &ecdsa, md_alg, hash, hash_len, sig, sig_len );
|
||||
if( ( ret = ecdsa_from_keypair( &ecdsa, ctx ) ) == 0 )
|
||||
ret = ecdsa_verify_wrap( &ecdsa, md_alg, hash, hash_len, sig, sig_len );
|
||||
|
||||
ecdsa_free( &ecdsa );
|
||||
|
||||
|
|
|
@ -2066,10 +2066,12 @@ static int ssl_write_certificate_verify( ssl_context *ssl )
|
|||
|
||||
ecdsa_init( &ecdsa );
|
||||
|
||||
ret = ecdsa_from_keypair( &ecdsa, ssl->pk_key->pk_ctx ) ||
|
||||
ecdsa_write_signature( &ecdsa, hash, hashlen,
|
||||
if( ( ret = ecdsa_from_keypair( &ecdsa, ssl->pk_key->pk_ctx ) ) == 0 )
|
||||
{
|
||||
ret = ecdsa_write_signature( &ecdsa, hash, hashlen,
|
||||
ssl->out_msg + 6 + offset, &n,
|
||||
ssl->f_rng, ssl->p_rng );
|
||||
}
|
||||
|
||||
ecdsa_free( &ecdsa );
|
||||
|
||||
|
|
|
@ -2106,10 +2106,13 @@ static int ssl_write_server_key_exchange( ssl_context *ssl )
|
|||
|
||||
ecdsa_init( &ecdsa );
|
||||
|
||||
ret = ecdsa_from_keypair( &ecdsa, ssl->pk_key->pk_ctx ) ||
|
||||
ecdsa_write_signature( &ecdsa, hash, hashlen,
|
||||
ret = ecdsa_from_keypair( &ecdsa, ssl->pk_key->pk_ctx );
|
||||
if( ret == 0 )
|
||||
{
|
||||
ret = ecdsa_write_signature( &ecdsa, hash, hashlen,
|
||||
p + 2, &signature_len,
|
||||
ssl->f_rng, ssl->p_rng );
|
||||
}
|
||||
|
||||
ecdsa_free( &ecdsa );
|
||||
|
||||
|
|
|
@ -605,8 +605,9 @@ static int x509_get_pubkey( unsigned char **p,
|
|||
#if defined(POLARSSL_ECP_C)
|
||||
if( pk_alg == POLARSSL_PK_ECKEY_DH || pk_alg == POLARSSL_PK_ECKEY )
|
||||
{
|
||||
ret = x509_use_ecparams( &alg_params, &pk_ec( *pk )->grp ) ||
|
||||
x509_get_ecpubkey( p, end, pk_ec( *pk ) );
|
||||
ret = x509_use_ecparams( &alg_params, &pk_ec( *pk )->grp );
|
||||
if( ret == 0 )
|
||||
ret = x509_get_ecpubkey( p, end, pk_ec( *pk ) );
|
||||
} else
|
||||
#endif /* POLARSSL_ECP_C */
|
||||
ret = POLARSSL_ERR_X509_UNKNOWN_PK_ALG;
|
||||
|
|
Loading…
Reference in a new issue