Commit 57cb030c authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 2739 

Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>

Fix padding bugs in Heartbeat support.
parent d441e6d8

ssl/d1_both.c

+2 −1
Original line number Diff line number Diff line
@@ -1422,8 +1422,9 @@ dtls1_process_heartbeat(SSL *s) 
		*bp++ = TLS1_HB_RESPONSE;

		s2n(payload, bp);

		memcpy(bp, pl, payload);

		bp += payload;

		/* Random padding */

		RAND_pseudo_bytes(p, padding);

		RAND_pseudo_bytes(bp, padding);



		r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer, 3 + payload + padding);

ssl/t1_lib.c

+4 −1
Original line number Diff line number Diff line
@@ -2467,6 +2467,9 @@ tls1_process_heartbeat(SSL *s) 
		*bp++ = TLS1_HB_RESPONSE;

		s2n(payload, bp);

		memcpy(bp, pl, payload);

		bp += payload;

		/* Random padding */

		RAND_pseudo_bytes(bp, padding);



		r = ssl3_write_bytes(s, TLS1_RT_HEARTBEAT, buffer, 3 + payload + padding);