From: Matt Caswell <matt@openssl.org>
Date: Wed, 7 Dec 2016 12:30:52 +0000 (+0000)
Subject: Fix travis mixed declarations and code error
X-Git-Tag: OpenSSL_1_1_1-pre1~2885
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=89247375efcf0869449a711fd248f160627de2a2;p=oweals%2Fopenssl.git

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>
---

diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c
index e6c617d544..370d0b9b02 100644
--- a/ssl/statem/extensions_srvr.c
+++ b/ssl/statem/extensions_srvr.c
@@ -694,8 +694,8 @@ int tls_construct_server_ec_pt_formats(SSL *s, WPACKET *pkt, int *al)
 {
     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;