From 55d7ec4ac77dda8d4fa627436ac5f1be61c74d3b Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 29 Jan 2017 15:20:18 +0000
Subject: Avoid clearing the mac_packet flag in the wrong place.

In many cases we got away with this, however if a server sends multiple
handshake messages in the same record only the first message would be added
to the MAC.

Should fix breakage reported by various people.
---
 src/lib/libssl/ssl_both.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/lib/libssl/ssl_both.c')

diff --git a/src/lib/libssl/ssl_both.c b/src/lib/libssl/ssl_both.c
index 0a33002809..2d79c24c86 100644
--- a/src/lib/libssl/ssl_both.c
+++ b/src/lib/libssl/ssl_both.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_both.c,v 1.4 2017/01/26 12:16:13 beck Exp $ */
+/* $OpenBSD: ssl_both.c,v 1.5 2017/01/29 15:20:18 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -523,7 +523,6 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
 	if (s->internal->mac_packet) {
 		tls1_finish_mac(s, (unsigned char *)s->internal->init_buf->data,
 		    s->internal->init_num + 4);
-		s->internal->mac_packet = 0;
 
 		if (s->internal->msg_callback)
 			s->internal->msg_callback(0, s->version,
-- 
cgit v1.2.3-55-g6feb