X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fd1_clnt.c;h=00cb43f09ee0239c8f2e81a0aa1952a2b0b1e7a2;hp=bb1fd6ac0a8682c26306f9cc3e492cdce2c77b17;hb=d0595f170c225b918a980f49c5d16ec53545a6ad;hpb=4817504d069b4c5082161b02a22116ad75f822b1 diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c index bb1fd6ac0a..00cb43f09e 100644 --- a/ssl/d1_clnt.c +++ b/ssl/d1_clnt.c @@ -330,7 +330,6 @@ int dtls1_connect(SSL *s) if (ret <= 0) goto end; else { - dtls1_stop_timer(s); if (s->hit) { #ifndef OPENSSL_NO_SCTP @@ -441,6 +440,7 @@ int dtls1_connect(SSL *s) 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 @@ -1695,7 +1695,7 @@ int dtls1_send_client_certificate(SSL *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;