generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check return value of ssl3_output_cert_chain

Browse Source 
(cherry picked from commit 66f96fe2d519147097c118d4bf60704c69ed0635)

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2014-03-18 14:19:22 +00:00 committed by Matt Caswell
parent 5ee441162e
commit c8667a2e46
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ssl/s3_clnt.c
View File

@ -3470,8 +3470,13 @@ int ssl3_send_client_certificate(SSL *s)
if (s->state == SSL3_ST_CW_CERT_C) if (s->state == SSL3_ST_CW_CERT_C)
{ {
s->state=SSL3_ST_CW_CERT_D; s->state=SSL3_ST_CW_CERT_D;
ssl3_output_cert_chain(s, if (!ssl3_output_cert_chain(s,
(s->s3->tmp.cert_req == 2)?NULL:s->cert->key); (s->s3->tmp.cert_req == 2)?NULL:s->cert->key))
{
SSLerr(SSL_F_SSL3_SEND_CLIENT_CERTIFICATE, ERR_R_INTERNAL_ERROR);
ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_INTERNAL_ERROR);
return 0;
}
} }
/* SSL3_ST_CW_CERT_D */ /* SSL3_ST_CW_CERT_D */
return ssl_do_write(s); return ssl_do_write(s);

6
ssl/s3_srvr.c
View File

@ -3450,7 +3450,11 @@ int ssl3_send_server_certificate(SSL *s)
} }
} }
ssl3_output_cert_chain(s,cpk); if (!ssl3_output_cert_chain(s,cpk))
{
SSLerr(SSL_F_SSL3_SEND_SERVER_CERTIFICATE,ERR_R_INTERNAL_ERROR);
return(0);
}
s->state=SSL3_ST_SW_CERT_B; s->state=SSL3_ST_SW_CERT_B;
} }