diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e10aeb9cb4ac1246171e628229e5e83ad63df199..bd929126c343b10f655ad7c8f8b65aaf983b6f01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ # include: - project: '${OPEN_IOT_SDK_BASE_GROUP}/tools/developer-tools' - ref: 0f9be210b6de0742ff3400a4ebe4ea2005810061 + ref: 570c6f7c1f646a762c069d77d34137771afa1939 file: - '/templates/pipeline-baseline-sdk.yml' - '/templates/sync-public/pipeline-sync-public.yml' @@ -41,9 +41,9 @@ workflow: stages: - autobot - - quality_check - - build_and_test - - sync_public + - quality-check + - build-and-test + - sync-public autobot: stage: autobot @@ -65,7 +65,7 @@ unit-tests: tags: - iotmsw-amd64 image: ${OPEN_IOT_SDK_DOCKER_REGISTRY}/sanity:v1 - stage: quality_check + stage: quality-check variables: *cppcheck_options script: - cmake -S . -B __build -GNinja -DENABLE_DEVELOPER_MODE=ON -DOPT_ENABLE_DOXYGEN=ON -DOPT_ENABLE_SANITIZER_LEAK=ON -DOPT_ENABLE_COVERAGE=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON @@ -112,7 +112,7 @@ unit-tests: .build-test-fvp-base: extends: .base-job-rules stage: - build_and_test + build-and-test trigger: include: .gitlab/ci/pipeline/pipelines_per_target/fvp.yml strategy: depend @@ -142,19 +142,19 @@ build-test-fvp-gcc: # This job will push DEFAULT branch changes to the public GitLab push-public: extends: .push-public - stage: sync_public + stage: sync-public # This job is triggered by scheduled pipeline of this repository running in internal GitLab. # This job will pull changes of the branch which is set to run the scheduled pipeline (often `main` branch). pull-public: extends: .pull-public - stage: sync_public + stage: sync-public upload-examples: image: ${OPEN_IOT_SDK_DOCKER_REGISTRY}/sanity:v1 tags: - iotmsw-amd64 - stage: sync_public + stage: sync-public variables: UPLOAD_DESTINATION : 'https://${GITLAB_USER_ID}:${UPDATE_SDK_EXAMPLES}@${OPEN_IOT_SDK_BASE}/examples/sdk-examples.git' rules: diff --git a/LICENSE.md.orig b/LICENSE.md.orig new file mode 100644 index 0000000000000000000000000000000000000000..0d52ea9a87ff29e07d4d241c5d0f815d910e217c --- /dev/null +++ b/LICENSE.md.orig @@ -0,0 +1,169 @@ +Unless specifically indicated otherwise in a file, files are licensed under the Apache 2.0 license, +as can be found in: LICENSE-apache-2.0.txt + +<<<<<<< HEAD +- [components/FreeRTOS-Kernel](components/FreeRTOS-Kernel) - MIT +- [components/lwip](components/lwip) - BSD-3-Clause +- [components/TF-M](components/TF-M) - BSD-3-Clause +- [components/TinyUSB](components/TinyUSB) - MIT +- [components/Storage/littlefs](components/Storage/littlefs) - BSD-3-Clause +- [components/Pigweed](components/Pigweed) - Apache 2.0 +- [components/AWS-IOT-device-sdk-embedded-C](components/AWS-IOT-device-sdk-embedded-C) - MIT +- [components/Azure-SDK](components/Azure-SDK) - MIT +- [components/azure-rtos](components/azure-rtos) - Microsoft Software License Terms for Microsoft Azure RTOS +======= +## Components +>>>>>>> a908c7b (license: List all components via json table) + +Folders containing external components are listed below. Each component should contain its own README file with license specified for its files. The original license text is included in those source files. + +```json:table +{ + "fields":[ + "Component", + "Path", + "License", + "Origin", + "Category", + "Version", + "Security risk" + ], + "items" :[ + { + "Component": "AWS-IOT-device-sdk-embedded-C", + "Path": "components/AWS-IOT-device-sdk-embedded-C", + "License": "MIT", + "Origin": "https://github.com/aws/aws-iot-device-sdk-embedded-C", + "Category": "2", + "Version": "75e545b0e807ab6dff9bcb0ee5942e9a58435b10", + "Security risk": "High" + }, + { + "Component": "Azure-SDK", + "Path": "components/Azure-SDK", + "License": "MIT", + "Origin": "https://github.com/Azure/azure-iot-sdk-c", + "Category": "2", + "Version": "LTS_01_2022_Ref01", + "Security risk": "low" + }, + { + "Component": "CMSIS_5", + "Path": "components/CMSIS_5", + "License": "Apache-2.0", + "Origin": "https://github.com/ARM-software/CMSIS_5", + "Category": "1", + "Version": "", + "Security risk": "low" + }, + { + "Component": "lwip", + "Path": "components/Connectivity/lwip", + "License": "BSD-3-Clause", + "Origin": "https://github.com/lwip-tcpip/lwip", + "Category": "2", + "Version": "STABLE-2_1_3_RELEASE", + "Security risk": "low" + }, + { + "Component": "fff", + "Path": "", + "License": "MIT", + "Origin": "https://github.com/meekrosoft/fff", + "Category": "2", + "Version": "v1.1", + "Security risk": "low" + }, + { + "Component": "FreeRTOS-Kernel", + "Path": "components/FreeRTOS-Kernel", + "License": "MIT", + "Origin": "https://github.com/ARM-software/CMSIS-FreeRTOS", + "Category": "2", + "Version": "b3cc689f417b2aff506a75ac15bfe4dbbecfaa50", + "Security risk": "low" + }, + { + "Component": "Googletest", + "Path": "", + "License": "BSD-3-Clause", + "Origin": "https://github.com/google/googletest", + "Category": "1", + "Version": "main tag", + "Security risk": "low" + }, + { + "Component": "ML-embedded-evaluation-kit", + "Path": "components/ML-embedded-evaluation-kit", + "License": "Apache-2.0", + "Origin": "https://review.mlplatform.org/ml/ethos-u/ml-embedded-evaluation-kit", + "Category": "2", + "Version": "22.05", + "Security risk": "low" + }, + { + "Component": "NimBLE", + "Path": "", + "License": "Apache-2.0", + "Origin": "https://github.com/apache/mynewt-nimble", + "Category": "2", + "Version": "f9eb3c8d27b07d441dc7a77de513ef940ad7da1f", + "Security risk": "low" + }, + { + "Component": "Pigweed", + "Path": "components/Pigweed", + "License": "Apache-2.0", + "Origin": "https://github.com/google/pigweed", + "Category": "2", + "Version": " 2952d3767e6a4b9511c73d63d2718fb7d1e7aaf7", + "Security risk": "low" + }, + { + "Component": "littlefs", + "Path": "components/Storage/littlefs", + "License": "BSD-3-Clause", + "Origin": "https://github.com/littlefs-project/littlefs", + "Category": "2", + "Version": "v2.5.0", + "Security risk": "low" + }, + { + "Component": "tf-m", + "Path": "components/TF-M", + "License": "BSD-3-Clause", + "Origin": "https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git", + "Category": "2", + "Version": "0d5b5ef49e20bc8d975759e2b373c9b308fa3538", + "Security risk": "high" + }, + { + "Component": "TinyUSB", + "Path": "components/TinyUSB", + "License": "MIT", + "Origin": "https://github.com/hathach/tinyusb", + "Category": "2", + "Version": "251ce9899039fbdf8e749342bc6504e7438d2e88", + "Security risk": "low" + }, + { + "Component": "mbedtls", + "Path": "components/mbedtls", + "License": "Apache-2.0", + "Origin": "https://github.com/ARMmbed/mbedtls", + "Category": "2", + "Version": "v2.26.0", + "Security risk": "high" + }, + { + "Component": "Threadx", + "Path": "components/azure-rtos", + "License": "Microsoft", + "Origin": "https://github.com/azure-rtos/threadx", + "Category": "2", + "Version": "v6.1.12_rel", + "Security risk": "low" + } + ] +} +``` diff --git a/components/mbed-os-netsocket/mock/include/mbedtls/ctr_drbg.h.orig b/components/mbed-os-netsocket/mock/include/mbedtls/ctr_drbg.h.orig new file mode 100644 index 0000000000000000000000000000000000000000..4eea9130b057ce3e1e01c3d828ee6721926b368a --- /dev/null +++ b/components/mbed-os-netsocket/mock/include/mbedtls/ctr_drbg.h.orig @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2022, Arm Limited and Contributors. All rights reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef MBEDTLS_CTR_DRBG_H +#define MBEDTLS_CTR_DRBG_H + +<<<<<<< Updated upstream +======= +#include "mbedtls/mbedtls_threading_cmsis_rtos.h" +#include "mbedtls/pk_types.h" +>>>>>>> Stashed changes +#include "fff.h" +#include "mbedtls/mbedtls_threading_cmsis_rtos.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \brief The AES context-type definition. + */ +typedef struct mbedtls_aes_context { + int MBEDTLS_PRIVATE(nr); /*!< The number of rounds. */ + size_t MBEDTLS_PRIVATE(rk_offset); /*!< The offset in array elements to AES + round keys in the buffer. */ + uint32_t MBEDTLS_PRIVATE(buf)[68]; /*!< Unaligned data buffer. This buffer can + hold 32 extra Bytes, which can be used for + one of the following purposes: + */ +} mbedtls_aes_context; + +typedef struct mbedtls_ctr_drbg_context { + unsigned char MBEDTLS_PRIVATE(counter)[16]; /*!< The counter (V). */ + int MBEDTLS_PRIVATE(reseed_counter); /*!< The reseed counter. + * This is the number of requests that have + * been made since the last (re)seeding, + * minus one. + * Before the initial seeding, this field + * contains the amount of entropy in bytes + * to use as a nonce for the initial seeding, + * or -1 if no nonce length has been explicitly + * set (see mbedtls_ctr_drbg_set_nonce_len()). + */ + int MBEDTLS_PRIVATE(prediction_resistance); /*!< This determines whether prediction + resistance is enabled, that is + whether to systematically reseed before + each random generation. */ + size_t MBEDTLS_PRIVATE(entropy_len); /*!< The amount of entropy grabbed on each + seed or reseed operation, in bytes. */ + int MBEDTLS_PRIVATE(reseed_interval); /*!< The reseed interval. + * This is the maximum number of requests + * that can be made between reseedings. */ + + mbedtls_aes_context MBEDTLS_PRIVATE(aes_ctx); /*!< The AES context. */ + + /* + * Callbacks (Entropy) + */ + int (*MBEDTLS_PRIVATE(f_entropy))(void *, unsigned char *, size_t); + /*!< The entropy callback function. */ + + void *MBEDTLS_PRIVATE(p_entropy); /*!< The context for the entropy function. */ + +#if defined(MBEDTLS_THREADING_C) + /* Invariant: the mutex is initialized if and only if f_entropy != NULL. + * This means that the mutex is initialized during the initial seeding + * in mbedtls_ctr_drbg_seed() and freed in mbedtls_ctr_drbg_free(). + * + * Note that this invariant may change without notice. Do not rely on it + * and do not access the mutex directly in application code. + */ + mbedtls_threading_mutex_t MBEDTLS_PRIVATE(mutex); +#endif +} mbedtls_ctr_drbg_context; + +typedef int (*func_type)(void *, unsigned char *, size_t); + +DECLARE_FAKE_VALUE_FUNC( + int, mbedtls_ctr_drbg_seed, mbedtls_ctr_drbg_context *, func_type, void *, const unsigned char *, size_t); +DECLARE_FAKE_VALUE_FUNC(int, mbedtls_ctr_drbg_random, void *, unsigned char *, size_t); + +DECLARE_FAKE_VOID_FUNC(mbedtls_ctr_drbg_init, mbedtls_ctr_drbg_context *); +DECLARE_FAKE_VOID_FUNC(mbedtls_ctr_drbg_free, mbedtls_ctr_drbg_context *); + +#ifdef __cplusplus +} +#endif + +#endif /* ctr_drbg.h */ diff --git a/developer-tools b/developer-tools index 0f9be210b6de0742ff3400a4ebe4ea2005810061..570c6f7c1f646a762c069d77d34137771afa1939 160000 --- a/developer-tools +++ b/developer-tools @@ -1 +1 @@ -Subproject commit 0f9be210b6de0742ff3400a4ebe4ea2005810061 +Subproject commit 570c6f7c1f646a762c069d77d34137771afa1939 diff --git a/release-changes/202212081605.change b/release-changes/202212081605.change new file mode 100644 index 0000000000000000000000000000000000000000..75537f46f7c5a0a7094804fbfda2e993e3d152b3 --- /dev/null +++ b/release-changes/202212081605.change @@ -0,0 +1 @@ +developer-tools: Update the component