Commit c7f26739 authored by David Benjamin's avatar David Benjamin Committed by Dr. Stephen Henson
Browse files

Check there is enough room for extension.

parent 470990fe

ssl/t1_lib.c

+4 −0
Original line number Diff line number Diff line
@@ -1416,6 +1416,8 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha 


#ifndef OPENSSL_NO_HEARTBEATS

	/* Add Heartbeat extension */

	if ((limit - ret - 4 - 1) < 0)

		return NULL;

	s2n(TLSEXT_TYPE_heartbeat,ret);

	s2n(1,ret);

	/* Set mode:
@@ -1698,6 +1700,8 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha 
	/* Add Heartbeat extension if we've received one */

	if (s->tlsext_heartbeat & SSL_TLSEXT_HB_ENABLED)

		{

		if ((limit - ret - 4 - 1) < 0)

			return NULL;

		s2n(TLSEXT_TYPE_heartbeat,ret);

		s2n(1,ret);

		/* Set mode: