summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2019-12-09 17:12:28 -0800
committerMichael Forney <mforney@mforney.org>2019-12-09 17:12:28 -0800
commitadc2604bd22922712b351ea7aca0b3db5703d119 (patch)
tree4e0bcaf1dbf829651e10e5cca8d21a29132fbb88 /pkg
parent4b96cb55a283889ebac0848264869f13d05421e2 (diff)
bearssl: Discard pending application data when closing
Diffstat (limited to 'pkg')
-rw-r--r--pkg/bearssl/patch/0001-Discard-pending-application-data-when-closing.patch32
-rw-r--r--pkg/bearssl/ver2
2 files changed, 33 insertions, 1 deletions
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
new file mode 100644
index 00000000..a702a66d
--- /dev/null
+++ 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
index 6607d4da..2821c549 100644
--- a/pkg/bearssl/ver
+++ b/pkg/bearssl/ver
@@ -1 +1 @@
-v0.6-23-g69807a3 r0
+v0.6-23-g69807a3 r1