mirror of
https://github.com/openwrt/packages.git
synced 2025-12-10 12:41:22 +00:00
libwebsockets: bump to version 4.4.1
Update to version 4.4.1 to provide compatibility with cmake 4.x Signed-off-by: Albrecht Lohofener <albrechtloh@gmx.de> [commit message edited] Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
committed by
Hannu Nyman
parent
d82e2db28b
commit
7a64ae9da2
@@ -8,13 +8,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libwebsockets
|
||||
PKG_VERSION:=4.3.3
|
||||
PKG_RELEASE:=2
|
||||
PKG_VERSION:=4.4.1
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/warmcat/libwebsockets/tar.gz/v$(PKG_VERSION)?
|
||||
PKG_HASH:=6fd33527b410a37ebc91bb64ca51bdabab12b076bc99d153d7c5dd405e4bdf90
|
||||
PKG_HASH:=472e6cfa77b6f80ff2cc176bc59f6cb2856df7e30e8f31afcbd1fc94ffd2f828
|
||||
|
||||
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
|
||||
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
From 19bd6a5bf8e06e5bfa3b331e0aa8c6f9fa7e3459 Mon Sep 17 00:00:00 2001
|
||||
From: Andy Green <andy@warmcat.com>
|
||||
Date: Mon, 7 Jul 2025 14:03:49 +0100
|
||||
Subject: [PATCH] ssh: set correct lengths for sigma and tau
|
||||
|
||||
---
|
||||
plugins/ssh-base/crypto/chacha.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/plugins/ssh-base/crypto/chacha.c
|
||||
+++ b/plugins/ssh-base/crypto/chacha.c
|
||||
@@ -59,8 +59,8 @@ typedef struct chacha_ctx chacha_ctx;
|
||||
a = PLUS(a,b); d = ROTATE(XOR(d,a), 8); \
|
||||
c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
|
||||
|
||||
-static const char sigma[16] = "expand 32-byte k";
|
||||
-static const char tau[16] = "expand 16-byte k";
|
||||
+static const char sigma[17] = "expand 32-byte k";
|
||||
+static const char tau[17] = "expand 16-byte k";
|
||||
|
||||
void
|
||||
chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits)
|
||||
@@ -1,23 +0,0 @@
|
||||
From 017dfcb144c557bb4bc72669168ad7b70a34ce57 Mon Sep 17 00:00:00 2001
|
||||
From: Seo Suchan <tjtncks@gmail.com>
|
||||
Date: Fri, 3 May 2024 17:18:46 +0900
|
||||
Subject: [PATCH 1/2] mbedtls: fix compile on mbedtls 3.6+ they moved
|
||||
mbedtls_x509_get_name into interal zone, this declares it again in a file I
|
||||
looked approperate to hold one
|
||||
|
||||
Signed-off-by: Seo Suchan <tjtncks@gmail.com>
|
||||
---
|
||||
lib/tls/mbedtls/private-lib-tls-mbedtls.h | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
--- a/lib/tls/mbedtls/private-lib-tls-mbedtls.h
|
||||
+++ b/lib/tls/mbedtls/private-lib-tls-mbedtls.h
|
||||
@@ -57,3 +57,8 @@ lws_tls_mbedtls_cert_info(mbedtls_x509_c
|
||||
int
|
||||
lws_x509_get_crt_ext(mbedtls_x509_crt *crt, mbedtls_x509_buf *skid,
|
||||
lws_mbedtls_x509_authority *akid);
|
||||
+
|
||||
+/* redefine hidden mbedtls internal functions*/
|
||||
+int
|
||||
+mbedtls_x509_get_name(unsigned char **p, const unsigned char *end,
|
||||
+ mbedtls_x509_name *cur);
|
||||
@@ -1,36 +0,0 @@
|
||||
From adcc5a1ccb9f6ffe9fca793ea67e6c3e7ad8274a Mon Sep 17 00:00:00 2001
|
||||
From: Seo Suchan <tjtncks@gmail.com>
|
||||
Date: Tue, 7 May 2024 12:46:08 +0900
|
||||
Subject: [PATCH 2/2] mbedtls: make it no longer depend on mbedtls_version_c
|
||||
complie flag
|
||||
|
||||
everything that code does is already done as macro constants
|
||||
and openwrt doesn't build with mbedtls with that flag by default
|
||||
|
||||
Signed-off-by: Seo Suchan <tjtncks@gmail.com>
|
||||
---
|
||||
lib/core/context.c | 13 ++++++++----
|
||||
1 file changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
--- a/lib/core/context.c
|
||||
+++ b/lib/core/context.c
|
||||
@@ -788,11 +788,15 @@ lws_create_context(const struct lws_cont
|
||||
#endif /* network */
|
||||
|
||||
#if defined(LWS_WITH_MBEDTLS)
|
||||
- mbedtls_version_get_string(mbedtls_version);
|
||||
-#endif
|
||||
+ {
|
||||
|
||||
-#if defined(LWS_WITH_MBEDTLS)
|
||||
- lwsl_cx_notice(context, "LWS: %s, MbedTLS-%s %s%s", library_version, mbedtls_version, opts_str, s);
|
||||
+#if defined(MBEDTLS_VERSION_C)
|
||||
+ mbedtls_version_get_string(mbedtls_version);
|
||||
+#else
|
||||
+ lws_snprintf(mbedtls_version, sizeof(mbedtls_version), "%s", MBEDTLS_VERSION_STRING);
|
||||
+#endif
|
||||
+ lwsl_cx_notice(context, "LWS: %s, MbedTLS-%s %s%s", library_version, mbedtls_version, opts_str, s);
|
||||
+ }
|
||||
#else
|
||||
lwsl_cx_notice(context, "LWS: %s, %s%s", library_version, opts_str, s);
|
||||
#endif
|
||||
Reference in New Issue
Block a user