From 1bce63801d10555c5b09b13bbd1e6ab515f74448 Mon Sep 17 00:00:00 2001
From: ading2210 <ading2019@gmail.com>
Date: Thu, 21 Mar 2024 13:03:05 -0400
Subject: [PATCH] update wisp client and server

---
 CHANGELOG.md            | 4 ++++
 client/package.json     | 2 +-
 client/tools/wolfssl.sh | 3 ++-
 client/wisp_client      | 2 +-
 server/run.sh           | 2 +-
 server/wisp_server      | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6eea07c..caf4398 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Libcurl.js Changelog:
 
+## v0.6.5 (3/20/24):
+- Update Wisp client and server
+- Compile WolfSSL with greater site support
+
 ## v0.6.4 (3/20/24):
 - Fix handling of request bodies
 
diff --git a/client/package.json b/client/package.json
index b695331..0f483f3 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "libcurl.js",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "An experimental port of libcurl to WebAssembly for use in the browser.",
   "main": "libcurl.mjs",
   "exports": {
diff --git a/client/tools/wolfssl.sh b/client/tools/wolfssl.sh
index d470e84..897da09 100755
--- a/client/tools/wolfssl.sh
+++ b/client/tools/wolfssl.sh
@@ -16,7 +16,8 @@ git clone -b v5.6.6-stable --depth=1 https://github.com/wolfSSL/wolfssl wolfssl
 cd wolfssl
 
 autoreconf -fi
-CFLAGS="-Oz -DSP_WORD_SIZE=32 -DWOLFSSL_NO_ATOMICS" emconfigure ./configure --prefix=$PREFIX --enable-curl --enable-static --disable-shared --host=i686-linux --disable-examples --disable-asm --enable-sni --enable-alpn --enable-truncatedhmac --enable-oldtls --enable-tlsv12 --enable-all-crypto --disable-asyncthreads --disable-threadlocal --enable-tlsx 
+export CFLAGS="-Oz -DSP_WORD_SIZE=32 -DWOLFSSL_NO_ATOMICS -DWOLFSSL_TICKET_NONCE_MALLOC" 
+emconfigure ./configure --prefix=$PREFIX --enable-curl --enable-static --disable-shared --host=i686-linux --disable-examples --disable-asm --enable-sni --enable-alpn --enable-truncatedhmac --enable-oldtls --enable-tlsv12 --enable-all-crypto --disable-asyncthreads --disable-threadlocal --enable-tlsx 
 emmake make -j$CORE_COUNT
 make install
 
diff --git a/client/wisp_client b/client/wisp_client
index f63a01d..6aa58be 160000
--- a/client/wisp_client
+++ b/client/wisp_client
@@ -1 +1 @@
-Subproject commit f63a01d33b850f6f45a059d1f6db3c45cbe47b1e
+Subproject commit 6aa58be0897501ac444b38e7e7c0008da24f79ba
diff --git a/server/run.sh b/server/run.sh
index 94d0ae1..ed89516 100755
--- a/server/run.sh
+++ b/server/run.sh
@@ -13,7 +13,7 @@ if [ ! -d "$SERVER_PATH.venv" ]; then
 fi
 source $SERVER_PATH/.venv/bin/activate
 
-if ! python3 -c "import websockets" 2> /dev/null; then
+if ! python3 -c "import websockets, asyncudp" 2> /dev/null; then
   pip3 install -r $SERVER_PATH/requirements.txt
 fi
 
diff --git a/server/wisp_server b/server/wisp_server
index b18670f..ae2ec5f 160000
--- a/server/wisp_server
+++ b/server/wisp_server
@@ -1 +1 @@
-Subproject commit b18670f742ec2ff8efaee6074c36dfb568f20ba2
+Subproject commit ae2ec5f867aa64495e99facfeecf4307ec46d702