Commit c8667a2e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson Committed by Matt Caswell
Browse files

Check return value of ssl3_output_cert_chain 



(cherry picked from commit 66f96fe2)

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 5ee44116

ssl/s3_clnt.c

+7 −2
Original line number Diff line number Diff line
@@ -3470,8 +3470,13 @@ int ssl3_send_client_certificate(SSL *s) 
	if (s->state == SSL3_ST_CW_CERT_C)

		{

		s->state=SSL3_ST_CW_CERT_D;

		ssl3_output_cert_chain(s,

			(s->s3->tmp.cert_req == 2)?NULL:s->cert->key);

		if (!ssl3_output_cert_chain(s,

			(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 */

	return ssl_do_write(s);

ssl/s3_srvr.c

+5 −1
Original line number Diff line number Diff line
@@ -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;

		}