summaryrefslogtreecommitdiffstats
path: root/lib/libssl/ssl_both.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2017-01-29 15:20:18 +0000
committerjsing <jsing@openbsd.org>2017-01-29 15:20:18 +0000
commit9137a28d427145543c5b5ece41bdcd2dc43fd38a (patch)
treeb846abbf8887684a9cf59b5f2868b2aca451e7a7 /lib/libssl/ssl_both.c
parentFix tcpdump(8) display of duration values provided in 802.11 control frames. (diff)
downloadwireguard-openbsd-9137a28d427145543c5b5ece41bdcd2dc43fd38a.tar.xz
wireguard-openbsd-9137a28d427145543c5b5ece41bdcd2dc43fd38a.zip
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.
Diffstat (limited to 'lib/libssl/ssl_both.c')
-rw-r--r--lib/libssl/ssl_both.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/libssl/ssl_both.c b/lib/libssl/ssl_both.c
index 0a330028096..2d79c24c86f 100644
--- a/lib/libssl/ssl_both.c
+++ b/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,