oasis

commit: adc2604bd22922712b351ea7aca0b3db5703d119
parent 4b96cb55a283889ebac0848264869f13d05421e2
Author: Michael Forney <mforney@mforney.org>
Date:   Mon,  9 Dec 2019 17:12:28 -0800

bearssl: Discard pending application data when closing

Diffstat:
M
.gitmodules
1
+
A
pkg/bearssl/patch/0001-Discard-pending-application-data-when-closing.patch
32
++++++++++++++++++++++++++++++++
M
pkg/bearssl/ver
2
+-

3 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/.gitmodules b/.gitmodules
@@ -16,6 +16,7 @@
 [submodule "pkg/bearssl/src"]
 	path = pkg/bearssl/src
 	url = https://www.bearssl.org/git/BearSSL
+	ignore = all
 [submodule "pkg/blind/src"]
 	path = pkg/blind/src
 	url = git://git.suckless.org/blind
diff --git a/pkg/bearssl/patch/0001-Discard-pending-application-data-when-closing.patch b/pkg/bearssl/patch/0001-Discard-pending-application-data-when-closing.patch
@@ -0,0 +1,32 @@
+From abdacfffd9321a20a43fccf1afd9b323708ad21d Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Mon, 9 Dec 2019 14:03:00 -0800
+Subject: [PATCH] Discard pending application data when closing
+
+---
+ src/ssl/ssl_engine.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/ssl/ssl_engine.c b/src/ssl/ssl_engine.c
+index f4ffe18..a3b866f 100644
+--- a/src/ssl/ssl_engine.c
++++ b/src/ssl/ssl_engine.c
+@@ -1231,7 +1231,15 @@ br_ssl_engine_recvrec_ack(br_ssl_engine_context *cc, size_t len)
+ void
+ br_ssl_engine_close(br_ssl_engine_context *cc)
+ {
++	size_t len;
++
+ 	if (!br_ssl_engine_closed(cc)) {
++		/*
++		 * Discard incoming application data.
++		 */
++		if (br_ssl_engine_recvapp_buf(cc, &len) != NULL)
++			br_ssl_engine_recvapp_ack(cc, len);
++
+ 		jump_handshake(cc, 1);
+ 	}
+ }
+-- 
+2.24.0
+
diff --git a/pkg/bearssl/ver b/pkg/bearssl/ver
@@ -1 +1 @@
-v0.6-23-g69807a3 r0
+v0.6-23-g69807a3 r1