From: Matt Caswell Date: Fri, 15 Jul 2016 09:04:11 +0000 (+0100) Subject: Simplify key_exchange_expected() logic X-Git-Tag: OpenSSL_1_1_0-pre6~202 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7d2c13a705acfad1827634e89356a72999a641a2;p=oweals%2Fopenssl.git 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 --- diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index 864f76cfcd..bcbb0fd2ba 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -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)