Merge branch 'master' into fix/nand_flash_not_working_with_esp32p4

Author: RathiSonika

.ignore_build_warnings.txt

@@ -1 +1,2 @@
 DeprecationWarning: pkg_resources is deprecated as an API
+WARNING: The following Kconfig variables were used in "if" clauses

libpng/idf_component.yml

@@ -1,11 +1,13 @@
-version: "1.6.39~1"
+version: "1.6.51"
 description: Portable Network Graphics(png) C library
 url: https://github.com/espressif/idf-extra-components/tree/master/libpng
 repository: "https://github.com/espressif/idf-extra-components.git"
+repository_info:
+  path: "libpng"
 documentation: "http://www.libpng.org/pub/png/pngdocs.html"
 issues: "https://github.com/espressif/idf-extra-components/issues"
 dependencies:
-  idf: ">=4.4"
+  idf: ">=5.0"
   zlib:
     version: "^1.2.13"
     override_path: "../zlib"

libpng/libpng

@@ -1,8 +1,8 @@
 /* pnglibconf.h - library build configuration */
 
-/* libpng version 1.6.40.git */
+/* libpng version 1.6.51 */
 
-/* Copyright (c) 2018-2023 Cosmin Truta */
+/* Copyright (c) 2018-2025 Cosmin Truta */
 /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
 
 /* This code is released under the libpng license. */
@@ -27,6 +27,7 @@
 #define PNG_COLORSPACE_SUPPORTED
 #define PNG_CONSOLE_IO_SUPPORTED
 #define PNG_CONVERT_tIME_SUPPORTED
+/*#undef PNG_DISABLE_ADLER32_CHECK_SUPPORTED*/
 #define PNG_EASY_ACCESS_SUPPORTED
 /*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
 #define PNG_ERROR_TEXT_SUPPORTED
@@ -41,6 +42,10 @@
 #define PNG_INCH_CONVERSIONS_SUPPORTED
 #define PNG_INFO_IMAGE_SUPPORTED
 #define PNG_IO_STATE_SUPPORTED
+/*#undef PNG_MIPS_MMI_API_SUPPORTED*/
+/*#undef PNG_MIPS_MMI_CHECK_SUPPORTED*/
+/*#undef PNG_MIPS_MSA_API_SUPPORTED*/
+/*#undef PNG_MIPS_MSA_CHECK_SUPPORTED*/
 #define PNG_MNG_FEATURES_SUPPORTED
 #define PNG_POINTER_INDEXING_SUPPORTED
 /*#undef PNG_POWERPC_VSX_API_SUPPORTED*/
@@ -83,11 +88,14 @@
 #define PNG_READ_USER_TRANSFORM_SUPPORTED
 #define PNG_READ_bKGD_SUPPORTED
 #define PNG_READ_cHRM_SUPPORTED
+#define PNG_READ_cICP_SUPPORTED
+#define PNG_READ_cLLI_SUPPORTED
 #define PNG_READ_eXIf_SUPPORTED
 #define PNG_READ_gAMA_SUPPORTED
 #define PNG_READ_hIST_SUPPORTED
 #define PNG_READ_iCCP_SUPPORTED
 #define PNG_READ_iTXt_SUPPORTED
+#define PNG_READ_mDCV_SUPPORTED
 #define PNG_READ_oFFs_SUPPORTED
 #define PNG_READ_pCAL_SUPPORTED
 #define PNG_READ_pHYs_SUPPORTED
@@ -153,11 +161,14 @@
 #define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
 #define PNG_WRITE_bKGD_SUPPORTED
 #define PNG_WRITE_cHRM_SUPPORTED
+#define PNG_WRITE_cICP_SUPPORTED
+#define PNG_WRITE_cLLI_SUPPORTED
 #define PNG_WRITE_eXIf_SUPPORTED
 #define PNG_WRITE_gAMA_SUPPORTED
 #define PNG_WRITE_hIST_SUPPORTED
 #define PNG_WRITE_iCCP_SUPPORTED
 #define PNG_WRITE_iTXt_SUPPORTED
+#define PNG_WRITE_mDCV_SUPPORTED
 #define PNG_WRITE_oFFs_SUPPORTED
 #define PNG_WRITE_pCAL_SUPPORTED
 #define PNG_WRITE_pHYs_SUPPORTED
@@ -171,11 +182,14 @@
 #define PNG_WRITE_zTXt_SUPPORTED
 #define PNG_bKGD_SUPPORTED
 #define PNG_cHRM_SUPPORTED
+#define PNG_cICP_SUPPORTED
+#define PNG_cLLI_SUPPORTED
 #define PNG_eXIf_SUPPORTED
 #define PNG_gAMA_SUPPORTED
 #define PNG_hIST_SUPPORTED
 #define PNG_iCCP_SUPPORTED
 #define PNG_iTXt_SUPPORTED
+#define PNG_mDCV_SUPPORTED
 #define PNG_oFFs_SUPPORTED
 #define PNG_pCAL_SUPPORTED
 #define PNG_pHYs_SUPPORTED

libpng/pnglibconf.h

@@ -1,7 +1,18 @@
 name: libpng
-version: 1.6.39
-cpe: cpe:2.3:a:libpng:libpng:{}:*:*:*:*:*:*:*
-supplier: 'Organization: libpng'
+version: 1.6.51
+cpe:
+ - cpe:2.3:a:pnggroup:libpng:{}:*:*:*:*:*:*:*
+ - cpe:2.3:a:libpng:libpng:{}:*:*:*:*:*:*:*
+supplier: 'Organization: pnggroup'
 description: Portable Network Graphics support, official PNG reference library
-url: https://github.com/glennrp/libpng
-hash: 07b8803110da160b158ebfef872627da6c85cbdf
+url: https://github.com/pnggroup/libpng
+hash: 49363adcfaf098748d7a4c8c624ad8c45a8c3a86
+cve-exclude-list:
+  - cve: CVE-2025-64720
+    reason: Resolved in version 1.6.51
+  - cve: CVE-2025-65018
+    reason: Resolved in version 1.6.51
+  - cve: CVE-2025-64505
+    reason: Resolved in version 1.6.51
+  - cve: CVE-2025-64506
+    reason: Resolved in version 1.6.51

libpng/sbom_libpng.yml

@@ -328,21 +328,49 @@ void sh2lib_free(struct sh2lib_handle *hd)
 int sh2lib_execute(struct sh2lib_handle *hd)
 {
     int ret;
-    ret = nghttp2_session_send(hd->http2_sess);
+    ret = sh2lib_execute_send(hd);
     if (ret != 0) {
-        ESP_LOGE(TAG, "[sh2-execute] HTTP2 session send failed %d", ret);
         return ret;
     }
 
-    ret = nghttp2_session_recv(hd->http2_sess);
+    ret = sh2lib_execute_recv(hd);
     if (ret != 0) {
-        ESP_LOGE(TAG, "[sh2-execute] HTTP2 session recv failed %d", ret);
         return ret;
     }
 
     return 0;
 }
 
+int sh2lib_execute_recv(struct sh2lib_handle *hd)
+{
+    if (hd == NULL) {
+        ESP_LOGE(TAG, "[sh2-execute-recv] pointer to sh2lib handle cannot be NULL");
+        return -1;
+    }
+
+    int ret = nghttp2_session_recv(hd->http2_sess);
+    if (ret != 0) {
+        ESP_LOGE(TAG, "[sh2-execute-recv] HTTP2 session recv failed %d", ret);
+    }
+
+    return ret;
+}
+
+int sh2lib_execute_send(struct sh2lib_handle *hd)
+{
+    if (hd == NULL) {
+        ESP_LOGE(TAG, "[sh2-execute-recv] pointer to sh2lib handle cannot be NULL");
+        return -1;
+    }
+
+    int ret = nghttp2_session_send(hd->http2_sess);
+    if (ret != 0) {
+        ESP_LOGE(TAG, "[sh2-execute-send] HTTP2 session send failed %d", ret);
+    }
+
+    return ret;
+}
+
 int sh2lib_do_get_with_nv(struct sh2lib_handle *hd, const nghttp2_nv *nva, size_t nvlen, sh2lib_frame_data_recv_cb_t recv_cb)
 {
     int ret = nghttp2_submit_request(hd->http2_sess, NULL, nva, nvlen, NULL, recv_cb);

sh2lib/sh2lib.c

@@ -203,6 +203,38 @@ int sh2lib_do_put(struct sh2lib_handle *hd, const char *path,
  */
 int sh2lib_execute(struct sh2lib_handle *hd);
 
+/**
+ * @brief Execute receive on an HTTP/2 connection
+ *
+ * While the API sh2lib_do_get(), sh2lib_do_post() setup the requests to be
+ * initiated with the server, this API performs the actual data send/receive
+ * operations on the HTTP/2 connection. The callback functions are accordingly
+ * called during the processing of these requests.
+ *
+ * @param[in] hd      Pointer to a variable of the type 'struct sh2lib_handle'
+ *
+ * @return
+ *             - 0 if it succeeds
+ *             - Negative error code from nghttp2 on failure
+ */
+int sh2lib_execute_recv(struct sh2lib_handle *hd);
+
+/**
+ * @brief Execute send on an HTTP/2 connection
+ *
+ * While the API sh2lib_do_get(), sh2lib_do_post() setup the requests to be
+ * initiated with the server, this API performs the actual data send/receive
+ * operations on the HTTP/2 connection. The callback functions are accordingly
+ * called during the processing of these requests.
+ *
+ * @param[in] hd      Pointer to a variable of the type 'struct sh2lib_handle'
+ *
+ * @return
+ *             - 0 if it succeeds
+ *             - Negative error code from nghttp2 on failure
+ */
+int sh2lib_execute_send(struct sh2lib_handle *hd);
+
 #define SH2LIB_MAKE_NV(NAME, VALUE)                                    \
   {                                                                    \
     (uint8_t *)NAME, (uint8_t *)VALUE, strlen(NAME), strlen(VALUE),    \