Simplify key_exchange_expected() logic
The static function key_exchange_expected() used to return -1 on error.
Commit 361a119127
changed that so that it can never fail. This means that
some tidy up can be done to simplify error handling in callers of that
function.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
This commit is contained in:
parent
1b5c44b810
commit
7d2c13a705
1 changed files with 0 additions and 5 deletions
|
@ -90,7 +90,6 @@ static ossl_inline int cert_req_allowed(SSL *s)
|
|||
* Return values are:
|
||||
* 1: Yes
|
||||
* 0: No
|
||||
* -1: Error
|
||||
*/
|
||||
static int key_exchange_expected(SSL *s)
|
||||
{
|
||||
|
@ -174,8 +173,6 @@ int ossl_statem_client_read_transition(SSL *s, int mt)
|
|||
}
|
||||
} else {
|
||||
ske_expected = key_exchange_expected(s);
|
||||
if (ske_expected < 0)
|
||||
goto err;
|
||||
/* SKE is optional for some PSK ciphersuites */
|
||||
if (ske_expected
|
||||
|| ((s->s3->tmp.new_cipher->algorithm_mkey & SSL_PSK)
|
||||
|
@ -209,8 +206,6 @@ int ossl_statem_client_read_transition(SSL *s, int mt)
|
|||
|
||||
case TLS_ST_CR_CERT_STATUS:
|
||||
ske_expected = key_exchange_expected(s);
|
||||
if (ske_expected < 0)
|
||||
goto err;
|
||||
/* SKE is optional for some PSK ciphersuites */
|
||||
if (ske_expected
|
||||
|| ((s->s3->tmp.new_cipher->algorithm_mkey & SSL_PSK)
|
||||
|
|
Loading…
Reference in a new issue