From d89cd382dacb5bd40a49209e5ddb6fe8facc008e Mon Sep 17 00:00:00 2001 From: Rob Stradling Date: Tue, 10 Sep 2013 12:20:29 +0100 Subject: [PATCH] Fix compilation with no-ec and/or no-tlsext. --- ssl/s3_lib.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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); -- 2.25.1