3 files changed, 10 insertions, 57 deletions

diff --git a/meta-networking/recipes-devtools/libcoap/libcoap/CVE-2024-0962.patch b/meta-networking/recipes-devtools/libcoap/libcoap/CVE-2024-0962.patch
deleted file mode 100644
index add52483b7..0000000000
--- a/meta-networking/recipes-devtools/libcoap/libcoap/CVE-2024-0962.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From bf6a303883bde40cf96b960c8574cddd89e71701 Mon Sep 17 00:00:00 2001
-From: Jon Shallow <supjps-libcoap@jpshallow.com>
-Date: Thu, 25 Jan 2024 18:03:17 +0000
-Subject: [PATCH] coap_oscore.c: Fix parsing OSCORE configuration information
-
-A vulnerability was found in obgm libcoap 4.3.4. It has been rated as critical.
-Affected by this issue is the function get_split_entry of the file src/coap_oscore.c of the component Configuration File Handler.
-The manipulation leads to stack-based buffer overflow.
-
-CVE: CVE-2024-0962
-
-Upstream-Status: Backport [https://github.com/obgm/libcoap/pull/1311]
-
-Signed-off-by: alperak <alperyasinak1@gmail.com>
----
- src/coap_oscore.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/coap_oscore.c b/src/coap_oscore.c
-index 83f785c92..e0fb22947 100644
---- a/src/coap_oscore.c
-+++ b/src/coap_oscore.c
-@@ -1678,11 +1678,12 @@ get_split_entry(const char **start,
-                 oscore_value_t *value) {
-   const char *begin = *start;
-   const char *end;
-+  const char *kend;
-   const char *split;
-   size_t i;
-
- retry:
--  end = memchr(begin, '\n', size);
-+  kend = end = memchr(begin, '\n', size);
-   if (end == NULL)
-     return 0;
-
-@@ -1693,7 +1694,7 @@ get_split_entry(const char **start,
-
-   if (begin[0] == '#' || (end - begin) == 0) {
-     /* Skip comment / blank line */
--    size -= end - begin + 1;
-+    size -= kend - begin + 1;
-     begin = *start;
-     goto retry;
-   }
diff --git a/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.5.bb
index 2f5d192a77..a4e5f5ca46 100644
--- a/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb
+++ b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.5.bb
@@ -2,18 +2,16 @@ SUMMARY = "A C implementation of the Constrained Application Protocol"
 DESCRIPTION = "libcoap implements a lightweight application-protocol for \
 devices that are constrained their resources such as computing power, \
 RF range, memory, bandwith, or network packet sizes."
-HOMEPAGE ="https://libcoap.net/"
+HOMEPAGE = "https://libcoap.net/"
 
 LICENSE = "BSD-2-Clause & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1978dbc41673ab1c20e64b287c8317bc"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9aa68c0f6785376aa8ec7f4f1aa6ae3c"
 
 SRC_URI = "git://github.com/obgm/libcoap.git;branch=main;protocol=https \
            file://run-ptest \
-           file://CVE-2024-0962.patch \
            "
-SRCREV = "5fd2f89ef068214130e5d60b7087ef48711fa615"
+SRCREV = "7cf7465b784baded4de183290c547d582becfd28"
 
-S = "${WORKDIR}/git"
 
 inherit autotools manpages pkgconfig ptest
 
@@ -24,13 +22,14 @@ PACKAGECONFIG ?= "\
     ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
 "
 PACKAGECONFIG[async] = "--enable-async,--disable-async"
-PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls,,,openssl mbedtls"
+PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls,,,openssl mbedtls wolfssl"
 PACKAGECONFIG[manpages] = "--enable-documentation --enable-doxygen --enable-manpages,--disable-documentation,asciidoc-native doxygen-native graphviz-native"
-PACKAGECONFIG[mbedtls] = "--with-mbedtls,--without-mbedtls,mbedtls,,,gnutls openssl"
-PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl,,,gnutls mbedtls"
+PACKAGECONFIG[mbedtls] = "--with-mbedtls,--without-mbedtls,mbedtls,,,gnutls openssl wolfssl"
+PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl,,,gnutls mbedtls wolfssl"
 PACKAGECONFIG[small-stack] = "--enable-small-stack,--disable-small-stack"
 PACKAGECONFIG[tcp] = "--enable-tcp,--disable-tcp"
 PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,cunit"
+PACKAGECONFIG[wolfssl] = "--with-wolfssl,--without-wolfssl,wolfssl,,,gnutls mbedtls openssl"
 
 EXTRA_OECONF = "\
     --with-epoll --enable-add-default-names \
@@ -43,7 +42,7 @@ python () {
         d.setVar('DISABLE_STATIC', '')
 }
 
-export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/catalog"
+export SGML_CATALOG_FILES = "file://${STAGING_ETCDIR_NATIVE}/xml/catalog"
 
 do_compile:prepend() {
     oe_runmake update-map-file
diff --git a/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb b/meta-networking/recipes-devtools/python/python3-scapy_2.6.0.bb
index d57cb977e4..fdef5473ef 100644
--- a/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb
+++ b/meta-networking/recipes-devtools/python/python3-scapy_2.6.0.bb
@@ -16,15 +16,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 # If you want ptest support, use the git repo
 # UTscapy does not exist in the pypi pkg
 #
-SRCREV = "0474c37bf1d147c969173d52ab3ac76d2404d981"
+SRCREV = "f7a64114b35fd8ee63ce07290f8a2dffd52b215f"
 SRC_URI = "git://github.com/secdev/scapy.git;branch=master;protocol=https \
            file://run-ptest"
 
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
-inherit setuptools3 ptest
+inherit python_setuptools_build_meta ptest
 
 do_install:append() {
         mv ${D}${bindir}/scapy ${D}${bindir}/scapy3