projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rearrange and test authz extension.
[oweals/openssl.git]
/
ssl
/
d1_clnt.c
diff --git
a/ssl/d1_clnt.c
b/ssl/d1_clnt.c
index 1b518d981ea0a2671e65ff51574ce0282f45eba0..4af8ffda4d57f75a2e7e1ccfec5aea2a8e534d4c 100644
(file)
--- a/
ssl/d1_clnt.c
+++ b/
ssl/d1_clnt.c
@@
-329,7
+329,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)
{
#ifndef OPENSSL_NO_SCTP
if (s->hit)
{
#ifndef OPENSSL_NO_SCTP
@@
-440,6
+439,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->s3->tmp.next_state=SSL3_ST_CW_CERT_A;
else
if (s->s3->tmp.cert_req)
s->s3->tmp.next_state=SSL3_ST_CW_CERT_A;
else
@@
-1694,7
+1694,7
@@
int dtls1_send_client_certificate(SSL *s)
{
s->state=SSL3_ST_CW_CERT_D;
l=dtls1_output_cert_chain(s,
{
s->state=SSL3_ST_CW_CERT_D;
l=dtls1_output_cert_chain(s,
- (s->s3->tmp.cert_req == 2)?NULL:s->cert->key
->x509
);
+ (s->s3->tmp.cert_req == 2)?NULL:s->cert->key);
s->init_num=(int)l;
s->init_off=0;
s->init_num=(int)l;
s->init_off=0;