From 89247375efcf0869449a711fd248f160627de2a2 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 7 Dec 2016 12:30:52 +0000 Subject: [PATCH] Fix travis mixed declarations and code error Perl changes reviewed by Richard Levitte. Non-perl changes reviewed by Rich Salz Reviewed-by: Rich Salz Reviewed-by: Richard Levitte --- ssl/statem/extensions_srvr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; -- GitLab