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

This commit is contained in:
Rob Stradling 2013-09-10 11:00:57 +01:00 committed by Ben Laurie
parent 4b61f6d2a6
commit 937f125efc

View File

@ -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);