wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Rob Stradling 2013-09-10 11:45:37 +01:00 committed by Ben Laurie
parent 07df5018be
commit 5fa3b54788
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ssl/s3_lib.c
View file

@ -4132,15 +4132,15 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
ii=sk_SSL_CIPHER_find(allow,c); ii=sk_SSL_CIPHER_find(allow,c);
if (ii >= 0) 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 ((alg_k & SSL_kEECDH) && (alg_a & SSL_aECDSA) && s->s3->is_probably_safari)
{ {
if (!ret) ret=sk_SSL_CIPHER_value(allow,ii); if (!ret) ret=sk_SSL_CIPHER_value(allow,ii);
continue;
} }
else #endif
{ ret=sk_SSL_CIPHER_value(allow,ii);
ret=sk_SSL_CIPHER_value(allow,ii); break;
break;
}
} }
} }
return(ret); return(ret);