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

Check there is enough room for extension. 

(cherry picked from commit 7d89b3bf42e4b4067371ab33ef7631434e41d1e4)
parent d52eb827

ssl/t1_lib.c

+4 −0
Original line number Diff line number Diff line
@@ -1380,6 +1380,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:
@@ -1658,6 +1660,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: