diff options
| author | Rob Stradling <rob@comodo.com> | 2013-09-10 11:45:37 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2013-09-16 14:03:21 +0100 |
| commit | 5fa3b5478834029c69ad110e563eea13f1aa06e0 (patch) | |
| tree | dc2bf955608e219b30a9c2a36ccc4729eb30626c /ssl/s3_lib.c | |
| parent | 07df5018befd637a2a02ebd767969aa953200b3f (diff) | |
Fix compilation with no-ec and/or no-tlsext.
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index d70286612c..26c0e96aed 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -4132,15 +4132,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); |