commit 89247375efcf0869449a711fd248f160627de2a2
author Matt Caswell <matt@openssl.org> Wed Dec 07 12:30:52 2016 +0000
committer Matt Caswell <matt@openssl.org> Thu Dec 08 17:20:51 2016 +0000
tree 8af9896b76e61798f233043bd4d07fdbcf30ea44
parent 14d21b690a73e1598a97afa5ad9f642d53f63db7

Fix travis mixed declarations and code error

Perl changes reviewed by Richard Levitte. Non-perl changes reviewed by Rich
Salz

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>

ssl/statem/extensions_srvr.c

diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c
index e6c617d..370d0b9 100644
--- a/ssl/statem/extensions_srvr.c
+++ b/ssl/statem/extensions_srvr.c
@@ -694,8 +694,8 @@
 {
     unsigned long alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
     unsigned long alg_a = s->s3->tmp.new_cipher->algorithm_auth;
-    int using_ecc = (alg_k & SSL_kECDHE) || (alg_a & SSL_aECDSA);
-    using_ecc = using_ecc && (s->session->tlsext_ecpointformatlist != NULL);
+    int using_ecc = ((alg_k & SSL_kECDHE) || (alg_a & SSL_aECDSA))
+                    && (s->session->tlsext_ecpointformatlist != NULL);
     const unsigned char *plist;
     size_t plistlen;