From 9beb948c0dae6056caddf46a9aa099e18905d184 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 3 Dec 2014 11:15:40 +0000 Subject: [PATCH] Checkout return value of dtls1_output_cert_chain Reviewed-by: Tim Hudson --- ssl/d1_clnt.c | 6 ++++++ ssl/d1_srvr.c | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c index 9947be22ff..9045fb9902 100644 --- a/ssl/d1_clnt.c +++ b/ssl/d1_clnt.c @@ -1717,6 +1717,12 @@ 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); + if (!l) + { + SSLerr(SSL_F_DTLS1_SEND_CLIENT_CERTIFICATE, ERR_R_INTERNAL_ERROR); + ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_INTERNAL_ERROR); + return 0; + } s->init_num=(int)l; s->init_off=0; diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c index a5660bc25b..e40701ee62 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -1625,6 +1625,11 @@ int dtls1_send_server_certificate(SSL *s) } l=dtls1_output_cert_chain(s,x); + if (!l) + { + SSLerr(SSL_F_DTLS1_SEND_SERVER_CERTIFICATE,ERR_R_INTERNAL_ERROR); + return(0); + } s->state=SSL3_ST_SW_CERT_B; s->init_num=(int)l; s->init_off=0; -- 2.25.1