From: Benjamin Kaduk <bkaduk@akamai.com>
Date: Tue, 14 Mar 2017 22:14:30 +0000 (-0500)
Subject: De-obfuscate
X-Git-Tag: OpenSSL_1_1_1-pre1~2041
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e0926ef49df09a85117d7442db83f321aeb5b982;p=oweals%2Fopenssl.git

De-obfuscate

No need to break out of the loop and repeat the loop termination
condition when we can just return.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2949)
---

diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index 8860462a1f..98159b54cc 100644
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c
@@ -102,10 +102,10 @@ static int use_ecc(SSL *s)
         if ((alg_k & (SSL_kECDHE | SSL_kECDHEPSK))
                 || (alg_a & SSL_aECDSA)
                 || c->min_tls >= TLS1_3_VERSION)
-            break;
+            return 1;
     }
 
-    return i < end;
+    return 0;
 }
 
 int tls_construct_ctos_ec_pt_formats(SSL *s, WPACKET *pkt, unsigned int context,