diff options
| author | Rob Stradling <rob@comodo.com> | 2013-09-10 11:00:57 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2013-09-16 15:07:52 +0100 |
| commit | 937f125efc80d7a4e80a5a02ec0eae02ea0b55ac (patch) | |
| tree | 8e8dbea9ee5c35e38f9dff91f615e48edfee5c2b /ssl | |
| parent | 4b61f6d2a675fdb57dc93991e7b332a745b44d1f (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 5539d22339..c2428f4822 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -4021,15 +4021,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); |