OpenSSL 3.5 (first shipped in wrynose) made HMAC_CTX a fully opaque
type by removing its struct definition from the public headers. It was
deprecated since OpenSSL 3.0 but the struct remained visible until 3.5.
libwebsockets uses HMAC_CTX_new() to detect which form to use in its
lws-genhash.h public header: if found it uses HMAC_CTX *ctx (pointer),
otherwise it falls back to HMAC_CTX ctx (embedded struct).
In cross-compilation the CMake CHECK_FUNCTION_EXISTS probe for
HMAC_CTX_new can fail due to native libraries being incorrectly pulled
into the aarch64 link test, causing the function to be reported as not
found. Before OpenSSL 3.5 this was a silent failure: the fallback
embedded struct still compiled fine. With OpenSSL 3.5 the fallback
now fails with "field has incomplete type".
Force LWS_HAVE_HMAC_CTX_new=ON so the pointer form is always used.
Signed-off-by: Kamlesh Gurudasani <kamlesh@ti.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
During the compile step, CMake will attempt to generate a test
certificate with openssl-native using a hard-coded path to the openssl
config:
openssl req -config /etc/ssl/openssl.cnf ...
Thus using the build host's openssl config. If the build host's openssl
is configured with options that openssl-native does not understand or
accept, the test certificate will not be generated:
[log.do_configure on openSUSE 16.0]
Searching for OpenSSL executable and dlls
OpenSSL executable: .../build/tmp/work/cortexa53-crypto-oe-linux/libwebsockets/4.5.2/recipe-sysroot-native/usr/bin/openssl
GENCERTS = 1
Generating SSL Certificates for the test-server...
Error configuring OpenSSL modules
4037413D467F0000:error:030000A9:digital envelope routines:alg_module_init:unknown option:../sources/openssl-3.5.4/crypto/evp/evp_cnf.c:61:name=rh-allow-sha1-signatures, value=yes
4037413D467F0000:error:0700006D:configuration file routines:module_run:module initialization error:../sources/openssl-3.5.4/crypto/conf/conf_mod.c:288:module=alg_section, value=evp_properties retcode=-1
CMake Warning at lib/tls/CMakeLists.txt:528 (message):
!!! Failed to generate SSL certificate for Test Server!!!:
OpenSSL return code = 1
and the subsequent do_install() step will fail:
| CMake Error at test-apps/cmake_install.cmake:126 (file):
| file INSTALL cannot find
| ".../build/tmp/work/cortexa53-crypto-oe-linux/libwebsockets/4.5.2/build/libwebsockets-test-server.key.pem":
| No such file or directory.
ERROR: Task (.../layers/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.5.2.bb:do_install) failed with exit code '1'
Fix the location where CMake looks for the openssl.cnf file in order
to use the one that comes with the openssl-native that will be used to
generate the certificate. Thus ensuring that they are in step in terms
of which configuration options will be acceptable.
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Fix:
| CMake Error at CMakeLists.txt:1 (cmake_minimum_required):
| Compatibility with CMake < 3.5 has been removed from CMake.
|
| Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
| to tell CMake that the project requires at least <min> but has been updated
| to work with policies introduced by <max> or earlier.
|
| Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
|
|
| -- Configuring incomplete, errors occurred!
Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Please see
https://git.yoctoproject.org/poky/commit/?id=4dd321f8b83afecd962393101b2a6861275b5265
for what changes are needed, and sed commands that can be used to make them en masse.
I've verified that bitbake -c patch world works with these, but did not run a world
build; the majority of recipes shouldn't need further fixups, but if there are
some that still fall out, they can be fixed in followups.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
* after buildpath warnings fix from:
https://git.openembedded.org/meta-openembedded/commit/?id=eeef1fddd9052bed4b1a91565260518eb042fed2
the LibwebsocketsTargets.cmake ends with:
INTERFACE_LINK_LIBRARIES "ssl;crypto;ssl;crypto;/libcap.so;-lpthread"
instead of:
INTERFACE_LINK_LIBRARIES "ssl;crypto;ssl;crypto;/OE/build/.../libwebsockets/4.3.3/lib32-recipe-sysroot/usr/lib/libcap.so;-lpthread"
which causes e.g. mosquitto to fail in do_compile with:
ninja: error: '/libcap.so', needed by 'src/mosquitto', missing and no known rule to make it
* this happens only when libwebsocket is built with libcap enabled
(by libcap in DEPENDS)
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
In order to remove absolute paths from the cmake artifacts, paths from
the `$lib` folder should also be stripped off, otherwise internally
linked libraries (e.g. libz) may appear.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
0001-Fix-Werror-enum-int-mismatch-in-lws_tls_server_abort.patch
removed since it's included in 4.3.3
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This is needed to be able to build mosquitto-native.
The dependency on libcap when building for native is needed because
cmake will pick up the existence of libcap from the host, but then the
build fails if it is not available in the sysroot. Unfortunately, there
does not seem to be any way to explicitly tell cmake to not build with
libcap.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This is the result of automated script (0.9.1) conversion:
oe-core/scripts/contrib/convert-overrides.py .
converting the metadata to use ":" as the override character instead of "_".
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Update the library to the 4.2.1 stable release.
This commit includes following changes:
8a580b59 v4.2.1
e90f005a vhost: listen: protect listen port transfer between
041baf93 mbedtls: sessions: clean session on bail path
4038a7d4 windows: align plat insert socket POLLIN handling to linux
a310e16f socks5: cast for mingw3 nonposix recv args
439651fa openssl: manage _GNU_SOURCE better
c042ba8c mqtt: handle NULL mqtt publish metadata
04761c4b event libs: glib: use glib.h specifically
599d318a mqtt: coverity: help coverity see we wont have an mqtt role wsi without mqtt member allocated
bae99f63 tls: add option to serialize ssl handshake
ff1b8ed0 tls: fix inbalanced tls restrict borrow/return calls
ad3901d0 raw-proxy: fix role bind flag
4bc8b1a4 extpoll: clean up test server for Wconversion in extpoll parts
eeea000c dns: handle EAI_NONAME as fatal
9e5acc05 minimal: hcmulti: modernize startup to use OPERATIONAL
55533f96 netlink: hold in COLDPLUG until we actually have some routing table contents
fa1a7040 sspc: close: differentiate between ss and sspc at final wsi close
3f0fef17 gcc: gcc8 only recognizes fallthu
e319b15b minimal: ws client spam: modernize with pvo and cancel service after interrupted
ea4d8008 service: fix casts for EXTERNAL_POLL
aea9d0ce tls-sessions: remove no stash warning
10c1b882 ss: check destroy null policy
e4aa3ece ss: check serialize null policy
4141a68f ss: avoid null ss policy on req tx len
de8185db ss: avoid null ss policy on req tx
526310df ss: h1: log dereferences NULL
7a283eba minimal: htt-client: send user agent and accept
3d13468e ctest: do not reuse ctest-ssp path
e3da2a3b android: getnameinfo uses nonstandard size_t
8398ef79 getifaddrs: casts for android
02ae95fa non-windows: explicit cast vaarg to mode_t
7c3c179e win32: client: just do WIN32 check
4c8195df windows: only conceal mode_t on windows
0ba8df6e threadpool: disassociate wsi on close
94c50618 tls: mbedtls: fix cast for dump helper
d896d401 freertos: check for forcing each time around service loop
cd87bc1c cmake: tls: use CHECK_SYMBOL_EXISTS
da17f018 plugin: post: check unexpected write after protocol unbind
1c935dff clean: else became a NOP
896a2e09 strexp: handle NULL better
aa090fc2 cygwin: include in unix type socket init
58a34cb0 examples: embedded: keep loop running on WROVER
85f772f2 OSX: Fixed can't find clock_gettime
014aa77e core-net: Remove unused variable
e1ef2301 ss: h2: handle zero length COLON_PATH for metadata
0557e919 sspc: handle nonexistent metadata cleanly
07bef6b8 coverity: ntp from blob: handle blob missing
2f9ed48d coverity: report problem in hpack_dynamic_size() to parent
d155970b coverity: h->cwsi must be valid if we are handling rx on it
2d97e343 ss: split out blob into own minimal example
c3dd4d05 ss: sspc: handle destroy for client_connect and request_tx
Signed-off-by: Luan Rafael Carneiro <luan.rafael@ossystems.com.br>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Event lib support is now built into dynamically loaded plugins so
package them separately and include them in RDEPENDS if enabled.
Building minimal-examples with generated SDK failed due to cmake
configuration had static enabled but not included into SDK. Solve
this by adding static as PACKAGECONFIG option and adding
${PN}-staticdev to RDEPENDS_${PN}-dev if enabled.
Remove CFLAGS_append with -Wno-error added for fixing building with
Os. This looks like it's fixed in upstream.
Signed-off-by: Alexander Vickberg <wickbergster@gmail.com>
lib/event-libs/libuv/libuv.c: In function 'elops_destroy_context1_uv':
lib/event-libs/libuv/libuv.c:519:7: error: 'm' may be used uninitialized in this function [-Werror=maybe-uninitialized]
if (m)
^
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
The LICENSE checksum update was required because the LICENSE file added an
initial clause, and the locations of the third-party sources changed.
Here is a diff of the old and new licenses:
--- LICENSE.old 2018-05-11 14:36:05.053031281 -0400
+++ LICENSE.new 2018-05-11 14:35:40.364931066 -0400
@@ -1,7 +1,13 @@
Libwebsockets and included programs are provided under the terms of the GNU
Library General Public License (LGPL) 2.1, with the following exceptions:
-1) Static linking of programs with the libwebsockets library does not
+1) Any reference, whether in these modifications or in the GNU
+Library General Public License 2.1, to this License, these terms, the
+GNU Lesser Public License, GNU Library General Public License, LGPL, or
+any similar reference shall refer to the GNU Library General Public
+License 2.1 as modified by these paragraphs 1) through 4).
+
+2) Static linking of programs with the libwebsockets library does not
constitute a derivative work and does not require the author to provide
source code for the program, use the shared libwebsockets libraries, or
link their program against a user-supplied version of libwebsockets.
@@ -10,7 +16,7 @@
changes to libwebsockets must be provided under the terms of the LGPL in
sections 1, 2, and 4.
-2) You do not have to provide a copy of the libwebsockets license with
+3) You do not have to provide a copy of the libwebsockets license with
programs that are linked to the libwebsockets library, nor do you have to
identify the libwebsockets license in your program or documentation as
required by section 6 of the LGPL.
@@ -22,26 +28,30 @@
"[program] is based in part on the work of the libwebsockets project
(https://libwebsockets.org)"
-3) Some sources included have their own, more liberal licenses, or options
+4) Some sources included have their own, more liberal licenses, or options
to get original sources with the liberal terms.
Original liberal license retained
- - lib/sha-1.c - 3-clause BSD license retained, link to original
+ - lib/misc/sha-1.c - 3-clause BSD license retained, link to original
- win32port/zlib - ZLIB license (see zlib.h)
+ - lib/tls/mbedtls/wrapper - Apache 2.0 (only built if linked against mbedtls)
Relicensed to libwebsocket license
- - lib/base64-decode.c - relicensed to LGPL2.1+SLE, link to original
- - lib/daemonize.c - relicensed from Public Domain to LGPL2.1+SLE,
- link to original Public Domain version
+ - lib/misc/base64-decode.c - relicensed to LGPL2.1+SLE, link to original
+ - lib/misc/daemonize.c - relicensed from Public Domain to LGPL2.1+SLE,
+ link to original Public Domain version
Public Domain (CC-zero) to simplify reuse
- - test-server/*.c
- - test-server/*.h
+ - test-apps/*.c
+ - test-apps/*.h
+ - minimal-examples/*
- lwsws/*
-
+
+------ end of exceptions
+
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Khem Raj
Peter Marko
Kamlesh Gurudasani
Wang Mingyu
Trevor Woerner
Alper Ak
Alexander Kanavin
Khem Raj
Martin Jansa
Gerard Salvatella
Peter Kjellerstedt
Livin Sunny
Lukas Rusak
Radovan Scasny
Luan Rafael Carneiro
zangrc
Alexander Vickberg
Oleksandr Kravchuk
Martin Balik
Pierre-Jean Texier
Adrian Bunk
Andreas Müller
Fabio Berton