[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  e0926ef49df09a85117d7442db83f321aeb5b982 (commit)
      from  a74db02a2e182a16c76a12da1ac8ae8a215746b0 (commit)


- Log -----------------------------------------------------------------
commit e0926ef49df09a85117d7442db83f321aeb5b982
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Tue Mar 14 17:14:30 2017 -0500

    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 at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2949)

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/extensions_clnt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index 8860462..98159b5 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,