summaryrefslogtreecommitdiff
path: root/pkg/bearssl
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2020-02-01 13:39:58 -0800
committerMichael Forney <mforney@mforney.org>2020-02-01 13:39:58 -0800
commit7069167d4a82761ab7486cb5783322f104f64579 (patch)
tree2e0bd142eae38b55d07e5f9a394dfba957fa6f07 /pkg/bearssl
parentf2e91b68052b132c1fee0ea08f787c2e293ce664 (diff)
bearssl: Update to latest git
Diffstat (limited to 'pkg/bearssl')
-rw-r--r--pkg/bearssl/patch/0001-Discard-pending-application-data-when-closing.patch32
m---------pkg/bearssl/src0
-rw-r--r--pkg/bearssl/ver2
3 files changed, 1 insertions, 33 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
deleted file mode 100644
index a702a66d..00000000
--- a/pkg/bearssl/patch/0001-Discard-pending-application-data-when-closing.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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/src b/pkg/bearssl/src
-Subproject 252dba914912e694d0e69754f0167060fc4d2ba
+Subproject acc70b1be60a6f321e2da618cd35d901b1a598a
diff --git a/pkg/bearssl/ver b/pkg/bearssl/ver
index 9e668b47..48af2ad9 100644
--- a/pkg/bearssl/ver
+++ b/pkg/bearssl/ver
@@ -1 +1 @@
-v0.6-25-g252dba9 r0
+0.6-27-gacc70b1 r0