Commit 270d65fa authored May 12, 2017 by Todd Short Committed by Matt Caswell Jun 06, 2017

Always flush the BIO when we send any alert



At the moment we flush the write BIO if we send a fatal alert, but not a
warning one. This can mean the warning is never sent if we never do another
write and subsequently flush the BIO. Instead we should just always flush
after writing an alert.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3432)

parent 84344efa

ssl/s3_msg.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -105,11 +105,9 @@ int ssl3_dispatch_alert(SSL *s)
		s->s3->alert_dispatch = 1;
		} else {
		/*
		* Alert sent to BIO. If it is important, flush it now. If the
		* message does not get sent due to non-blocking IO, we will not
		* worry too much.
		* Alert sent to BIO - now flush. If the message does not get sent due
		* to non-blocking IO, we will not worry too much.
		*/
		if (s->s3->send_alert[0] == SSL3_AL_FATAL)
		(void)BIO_flush(s->wbio);

		if (s->msg_callback)

Admin message