projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0b05204
)
Fix compilation with this branch's definition of SSL_CIPHER.
author
Rob Stradling
<rob@comodo.com>
Tue, 10 Sep 2013 12:04:05 +0000
(13:04 +0100)
committer
Ben Laurie
<ben@links.org>
Fri, 4 Oct 2013 13:55:01 +0000
(14:55 +0100)
ssl/s3_lib.c
patch
|
blob
|
history
diff --git
a/ssl/s3_lib.c
b/ssl/s3_lib.c
index 531063679d787623fab9c015008eda777d750f6e..fc723a00a9759a637f54dd0c71174f02870e97a0 100644
(file)
--- a/
ssl/s3_lib.c
+++ b/
ssl/s3_lib.c
@@
-2404,7
+2404,7
@@
SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
if (j >= 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
& SSL_kECDHE) && (alg
& SSL_aECDSA) && s->s3->is_probably_safari)
{
if (!ret) ret=sk_SSL_CIPHER_value(allow,j);
continue;