diff options
author | Rob Stradling <rob@comodo.com> | 2013-09-10 12:20:29 +0100 |
---|---|---|
committer | Ben Laurie <ben@links.org> | 2013-09-13 16:24:22 +0100 |
commit | d89cd382dacb5bd40a49209e5ddb6fe8facc008e (patch) | |
tree | b6e2938550be242487da760e74ef0e26d3f45e08 /ssl | |
parent | 5628ec66730aaa5d3cc7bcbec7fd20b15b3a4911 (diff) |
Fix compilation with no-ec and/or no-tlsext.
Diffstat (limited to 'ssl')
-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 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); |