projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't prefer ECDHE-ECDSA ciphers when the client appears to be Safari on OS X.
[oweals/openssl.git]
/
ssl
/
d1_clnt.c
diff --git
a/ssl/d1_clnt.c
b/ssl/d1_clnt.c
index 4001a5a67372840e9a9c57f038648d8d52ae117b..ac24bfb35ed82d2f7883c2b75bdaca03221a854e 100644
(file)
--- a/
ssl/d1_clnt.c
+++ b/
ssl/d1_clnt.c
@@
-257,7
+257,6
@@
int dtls1_connect(SSL *s)
if (ret <= 0) goto end;
else
{
if (ret <= 0) goto end;
else
{
- dtls1_stop_timer(s);
if (s->hit)
s->state=SSL3_ST_CR_FINISHED_A;
else
if (s->hit)
s->state=SSL3_ST_CR_FINISHED_A;
else
@@
-350,6
+349,7
@@
int dtls1_connect(SSL *s)
case SSL3_ST_CR_SRVR_DONE_B:
ret=ssl3_get_server_done(s);
if (ret <= 0) goto end;
case SSL3_ST_CR_SRVR_DONE_B:
ret=ssl3_get_server_done(s);
if (ret <= 0) goto end;
+ dtls1_stop_timer(s);
if (s->s3->tmp.cert_req)
s->state=SSL3_ST_CW_CERT_A;
else
if (s->s3->tmp.cert_req)
s->state=SSL3_ST_CW_CERT_A;
else