Fix travis mixed declarations and code error
authorMatt Caswell <matt@openssl.org>
Wed, 7 Dec 2016 12:30:52 +0000 (12:30 +0000)
committerMatt Caswell <matt@openssl.org>
Thu, 8 Dec 2016 17:20:51 +0000 (17:20 +0000)
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

index e6c617d..370d0b9 100644 (file)
@@ -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;