From: Rob Stradling <rob@comodo.com>
Date: Tue, 10 Sep 2013 11:20:29 +0000 (+0100)
Subject: Fix compilation with no-ec and/or no-tlsext.
X-Git-Tag: master-post-reformat~1185
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d89cd382dacb5bd40a49209e5ddb6fe8facc008e;p=oweals%2Fopenssl.git

Fix compilation with no-ec and/or no-tlsext.
---

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 321db08e66..331c4e631a 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -4156,15 +4156,15 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
 		ii=sk_SSL_CIPHER_find(allow,c);
 		if (ii >= 0)
 			{
+#if !defined(OPENSSL_NO_EC) && !defined(OPENSSL_NO_TLSEXT)
 			if ((alg_k & SSL_kEECDH) && (alg_a & SSL_aECDSA) && s->s3->is_probably_safari)
 				{
 				if (!ret) ret=sk_SSL_CIPHER_value(allow,ii);
+				continue;
 				}
-			else
-				{
-				ret=sk_SSL_CIPHER_value(allow,ii);
-				break;
-				}
+#endif
+			ret=sk_SSL_CIPHER_value(allow,ii);
+			break;
 			}
 		}
 	return(ret);