From 16b93cbee2019e5ba757f755e7ae88712ca463e2 Mon Sep 17 00:00:00 2001 From: Simone Orru Date: Wed, 4 Dec 2024 10:03:08 +0100 Subject: [PATCH] Support for Zephyr 3.7.1 Signed-off-by: Simone Orru --- e2e/prj.conf | 8 ++---- get_started.md | 9 +++---- samples/astarte_app/include/tls-conf.h | 26 ------------------- samples/astarte_app/prj.conf | 8 ++---- .../integration/device_caching/prj.conf | 2 -- .../integration/introspection/prj.conf | 2 -- .../integration/kv_storage/prj.conf | 2 -- .../integration/uuid/prj.conf | 2 -- .../integration/zlib/prj.conf | 2 -- west-ci.yml | 2 +- west-e2e.yml | 2 +- west.yml | 2 +- 12 files changed, 10 insertions(+), 57 deletions(-) delete mode 100644 samples/astarte_app/include/tls-conf.h diff --git a/e2e/prj.conf b/e2e/prj.conf index c33f7900..01d0fc82 100644 --- a/e2e/prj.conf +++ b/e2e/prj.conf @@ -78,16 +78,12 @@ CONFIG_DNS_SERVER1="8.8.8.8" # Google DNS CONFIG_MBEDTLS=y CONFIG_MBEDTLS_BUILTIN=y CONFIG_MBEDTLS_ENABLE_HEAP=y -# 55kB is the max absolute value, could be set much lower CONFIG_MBEDTLS_HEAP_SIZE=55000 -# 16384 is the max absolute value, could be set much lower CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384 -CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y # Does not include writing -CONFIG_MBEDTLS_PK_WRITE_C=y # Required for PEM writing (also needs MBEDTLS_PEM_WRITE_C) +CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y +CONFIG_MBEDTLS_PK_WRITE_C=y CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y -CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y -CONFIG_MBEDTLS_USER_CONFIG_FILE="../samples/astarte_app/include/tls-conf.h" CONFIG_MBEDTLS_TLS_VERSION_1_2=y CONFIG_MBEDTLS_CIPHER=y CONFIG_MBEDTLS_CIPHER_ALL_ENABLED=y diff --git a/get_started.md b/get_started.md index c8858c89..31928215 100644 --- a/get_started.md +++ b/get_started.md @@ -109,16 +109,13 @@ CONFIG_MQTT_LIB_TLS=y # MbedTLS CONFIG_MBEDTLS=y +CONFIG_MBEDTLS_BUILTIN=y CONFIG_MBEDTLS_ENABLE_HEAP=y -# 55kB is the max absolute value, could be set much lower CONFIG_MBEDTLS_HEAP_SIZE=55000 -# 16384 is the max absolute value, could be set much lower CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384 -CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y # Does not include writing -CONFIG_MBEDTLS_PK_WRITE_C=y # Required for PEM writing (also needs MBEDTLS_PEM_WRITE_C) +CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y +CONFIG_MBEDTLS_PK_WRITE_C=y CONFIG_MBEDTLS_X509_CSR_WRITE_C=y -CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y -CONFIG_MBEDTLS_USER_CONFIG_FILE="../samples/astarte_app/include/tls-conf.h" CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y CONFIG_MBEDTLS_TLS_VERSION_1_2=y diff --git a/samples/astarte_app/include/tls-conf.h b/samples/astarte_app/include/tls-conf.h deleted file mode 100644 index e4d9e165..00000000 --- a/samples/astarte_app/include/tls-conf.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * (C) Copyright 2024, SECO Mind Srl - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#ifndef TLS_CONF_H -#define TLS_CONF_H - -/** - * \def MBEDTLS_PEM_WRITE_C - * - * Enable PEM encoding / writing. - * - * Module: library/pem.c - * Caller: library/pkwrite.c - * library/x509write_crt.c - * library/x509write_csr.c - * - * Requires: MBEDTLS_BASE64_C - * - * This modules adds support for encoding / writing PEM files. - */ -#define MBEDTLS_PEM_WRITE_C - -#endif /* TLS_CONF_H */ diff --git a/samples/astarte_app/prj.conf b/samples/astarte_app/prj.conf index f3b666eb..4dd87c15 100644 --- a/samples/astarte_app/prj.conf +++ b/samples/astarte_app/prj.conf @@ -53,16 +53,12 @@ CONFIG_DNS_SERVER1="8.8.8.8" # Google DNS CONFIG_MBEDTLS=y CONFIG_MBEDTLS_BUILTIN=y CONFIG_MBEDTLS_ENABLE_HEAP=y -# 55kB is the max absolute value, could be set much lower CONFIG_MBEDTLS_HEAP_SIZE=55000 -# 16384 is the max absolute value, could be set much lower CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384 -CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y # Does not include writing -CONFIG_MBEDTLS_PK_WRITE_C=y # Required for PEM writing (also needs MBEDTLS_PEM_WRITE_C) +CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y +CONFIG_MBEDTLS_PK_WRITE_C=y CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y -CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y -CONFIG_MBEDTLS_USER_CONFIG_FILE="../samples/astarte_app/include/tls-conf.h" CONFIG_MBEDTLS_TLS_VERSION_1_2=y CONFIG_MBEDTLS_CIPHER=y CONFIG_MBEDTLS_CIPHER_ALL_ENABLED=y diff --git a/tests/lib/astarte_device_sdk/integration/device_caching/prj.conf b/tests/lib/astarte_device_sdk/integration/device_caching/prj.conf index d85e3d07..9ca81425 100644 --- a/tests/lib/astarte_device_sdk/integration/device_caching/prj.conf +++ b/tests/lib/astarte_device_sdk/integration/device_caching/prj.conf @@ -39,8 +39,6 @@ CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y CONFIG_MBEDTLS_PK_WRITE_C=y CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y -CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y -CONFIG_MBEDTLS_USER_CONFIG_FILE="../../../../astarte-device-sdk-zephyr/tests/lib/astarte_device_sdk/integration/include/native-sim-tls-conf.h" CONFIG_MBEDTLS_TLS_VERSION_1_2=y CONFIG_MBEDTLS_CIPHER=y CONFIG_MBEDTLS_CIPHER_ALL_ENABLED=y diff --git a/tests/lib/astarte_device_sdk/integration/introspection/prj.conf b/tests/lib/astarte_device_sdk/integration/introspection/prj.conf index 2af3da61..e025d54c 100644 --- a/tests/lib/astarte_device_sdk/integration/introspection/prj.conf +++ b/tests/lib/astarte_device_sdk/integration/introspection/prj.conf @@ -20,8 +20,6 @@ CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y CONFIG_MBEDTLS_PK_WRITE_C=y CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y -CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y -CONFIG_MBEDTLS_USER_CONFIG_FILE="../../../../astarte-device-sdk-zephyr/tests/lib/astarte_device_sdk/integration/include/native-sim-tls-conf.h" CONFIG_MBEDTLS_TLS_VERSION_1_2=y CONFIG_MBEDTLS_CIPHER=y CONFIG_MBEDTLS_CIPHER_ALL_ENABLED=y diff --git a/tests/lib/astarte_device_sdk/integration/kv_storage/prj.conf b/tests/lib/astarte_device_sdk/integration/kv_storage/prj.conf index d85e3d07..9ca81425 100644 --- a/tests/lib/astarte_device_sdk/integration/kv_storage/prj.conf +++ b/tests/lib/astarte_device_sdk/integration/kv_storage/prj.conf @@ -39,8 +39,6 @@ CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y CONFIG_MBEDTLS_PK_WRITE_C=y CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y -CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y -CONFIG_MBEDTLS_USER_CONFIG_FILE="../../../../astarte-device-sdk-zephyr/tests/lib/astarte_device_sdk/integration/include/native-sim-tls-conf.h" CONFIG_MBEDTLS_TLS_VERSION_1_2=y CONFIG_MBEDTLS_CIPHER=y CONFIG_MBEDTLS_CIPHER_ALL_ENABLED=y diff --git a/tests/lib/astarte_device_sdk/integration/uuid/prj.conf b/tests/lib/astarte_device_sdk/integration/uuid/prj.conf index 7bcc8f90..f5502794 100644 --- a/tests/lib/astarte_device_sdk/integration/uuid/prj.conf +++ b/tests/lib/astarte_device_sdk/integration/uuid/prj.conf @@ -18,8 +18,6 @@ CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y CONFIG_MBEDTLS_PK_WRITE_C=y CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y -CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y -CONFIG_MBEDTLS_USER_CONFIG_FILE="../../../../astarte-device-sdk-zephyr/tests/lib/astarte_device_sdk/integration/include/native-sim-tls-conf.h" CONFIG_MBEDTLS_TLS_VERSION_1_2=y CONFIG_MBEDTLS_CIPHER=y CONFIG_MBEDTLS_CIPHER_ALL_ENABLED=y diff --git a/tests/lib/astarte_device_sdk/integration/zlib/prj.conf b/tests/lib/astarte_device_sdk/integration/zlib/prj.conf index 0d8a95a0..9b75fe17 100644 --- a/tests/lib/astarte_device_sdk/integration/zlib/prj.conf +++ b/tests/lib/astarte_device_sdk/integration/zlib/prj.conf @@ -19,8 +19,6 @@ CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y CONFIG_MBEDTLS_PK_WRITE_C=y CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y -CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y -CONFIG_MBEDTLS_USER_CONFIG_FILE="../../../../astarte-device-sdk-zephyr/tests/lib/astarte_device_sdk/integration/include/native-sim-tls-conf.h" CONFIG_MBEDTLS_TLS_VERSION_1_2=y CONFIG_MBEDTLS_CIPHER=y CONFIG_MBEDTLS_CIPHER_ALL_ENABLED=y diff --git a/west-ci.yml b/west-ci.yml index 67f36bbe..cac612e4 100644 --- a/west-ci.yml +++ b/west-ci.yml @@ -15,7 +15,7 @@ manifest: projects: - name: zephyr remote: zephyrproject-rtos - revision: v3.7.0 + revision: v3.7.1 import: # By using name-allowlist we can clone only the modules that are # strictly needed by the application. diff --git a/west-e2e.yml b/west-e2e.yml index a9adee13..49239fad 100644 --- a/west-e2e.yml +++ b/west-e2e.yml @@ -15,7 +15,7 @@ manifest: projects: - name: zephyr remote: zephyrproject-rtos - revision: v3.7.0 + revision: v3.7.1 import: # By using name-allowlist we can clone only the modules that are # strictly needed by the application. diff --git a/west.yml b/west.yml index 7a4f993e..f7e96993 100644 --- a/west.yml +++ b/west.yml @@ -15,7 +15,7 @@ manifest: projects: - name: zephyr remote: zephyrproject-rtos - revision: v3.7.0 + revision: v3.7.1 import: true - name: zlib-zephyr remote: secomind