From 0d41c4392a6f5104ddcfa8631af449af84d0b27f Mon Sep 17 00:00:00 2001 From: Eduardo Montoya Date: Thu, 4 Feb 2021 17:24:53 +0100 Subject: [PATCH] [nrf528xx] update nrf_security license (#6137) --- .../libraries/nrf_security/config/nrf-config.h | 2 +- .../libraries/nrf_security/include/mbedtls/ccm_alt.h | 2 +- .../libraries/nrf_security/include/mbedtls/chacha20_alt.h | 2 +- .../libraries/nrf_security/include/mbedtls/chachapoly_alt.h | 2 +- .../libraries/nrf_security/include/mbedtls/ecp_alt.h | 2 +- .../libraries/nrf_security/include/mbedtls/platform_alt.h | 2 +- .../libraries/nrf_security/include/mbedtls/poly1305_alt.h | 2 +- .../libraries/nrf_security/include/mbedtls/sha1_alt.h | 2 +- .../libraries/nrf_security/include/mbedtls/sha256_alt.h | 2 +- .../libraries/nrf_security/include/mbedtls/threading_alt.h | 6 +++--- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/config/nrf-config.h b/third_party/NordicSemiconductor/libraries/nrf_security/config/nrf-config.h index 8160f1c32..3d933930b 100644 --- a/third_party/NordicSemiconductor/libraries/nrf_security/config/nrf-config.h +++ b/third_party/NordicSemiconductor/libraries/nrf_security/config/nrf-config.h @@ -10,7 +10,7 @@ /* * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. * - * SPDX-License-Identifier: BSD-3-Clause OR Arm’s non-OSI source license + * SPDX-License-Identifier: Apache-2.0 */ #ifndef MBEDTLS_CONFIG_H diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/ccm_alt.h b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/ccm_alt.h index 3dbd0ac76..2d9733f35 100644 --- a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/ccm_alt.h +++ b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/ccm_alt.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. * - * SPDX-License-Identifier: BSD-3-Clause OR Arm’s non-OSI source license + * SPDX-License-Identifier: BSD-3-Clause */ #ifndef MBEDTLS_CCM_ALT_H diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/chacha20_alt.h b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/chacha20_alt.h index 52018f185..36bb3e144 100644 --- a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/chacha20_alt.h +++ b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/chacha20_alt.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. * - * SPDX-License-Identifier: BSD-3-Clause OR Arm’s non-OSI source license + * SPDX-License-Identifier: BSD-3-Clause */ #ifndef MBEDTLS_CHACHA20_ALT_H diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/chachapoly_alt.h b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/chachapoly_alt.h index edfecbe6f..3e80ed417 100644 --- a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/chachapoly_alt.h +++ b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/chachapoly_alt.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. * - * SPDX-License-Identifier: BSD-3-Clause OR Arm’s non-OSI source license + * SPDX-License-Identifier: BSD-3-Clause */ #ifndef MBEDTLS_CHACHAPOLY_ALT_H diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/ecp_alt.h b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/ecp_alt.h index 4a828f3db..328845377 100644 --- a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/ecp_alt.h +++ b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/ecp_alt.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. * - * SPDX-License-Identifier: BSD-3-Clause OR Arm’s non-OSI source license + * SPDX-License-Identifier: BSD-3-Clause */ #ifndef MBEDTLS_ECP_ALT_H #define MBEDTLS_ECP_ALT_H diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/platform_alt.h b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/platform_alt.h index bde4dfc1e..4187e8b24 100644 --- a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/platform_alt.h +++ b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/platform_alt.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. * - * SPDX-License-Identifier: BSD-3-Clause OR Arm’s non-OSI source license + * SPDX-License-Identifier: BSD-3-Clause */ #ifndef MBEDTLS_PLATFORM_ALT_H diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/poly1305_alt.h b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/poly1305_alt.h index c9fffad6a..93d400d81 100644 --- a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/poly1305_alt.h +++ b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/poly1305_alt.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. * - * SPDX-License-Identifier: BSD-3-Clause OR Arm’s non-OSI source license + * SPDX-License-Identifier: BSD-3-Clause */ #ifndef MBEDTLS_POLY1305_ALT_H diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/sha1_alt.h b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/sha1_alt.h index 2d6cbafbe..9da1a39c5 100644 --- a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/sha1_alt.h +++ b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/sha1_alt.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. * - * SPDX-License-Identifier: BSD-3-Clause OR Arm’s non-OSI source license + * SPDX-License-Identifier: BSD-3-Clause */ #ifndef MBEDTLS_SHA1_ALT_H diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/sha256_alt.h b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/sha256_alt.h index f828afda9..c368a540b 100644 --- a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/sha256_alt.h +++ b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/sha256_alt.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. * - * SPDX-License-Identifier: BSD-3-Clause OR Arm’s non-OSI source license + * SPDX-License-Identifier: BSD-3-Clause */ #ifndef MBEDTLS_SHA256_ALT_H diff --git a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/threading_alt.h b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/threading_alt.h index 7722cf23e..23c1d29df 100644 --- a/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/threading_alt.h +++ b/third_party/NordicSemiconductor/libraries/nrf_security/include/mbedtls/threading_alt.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2001-2019, Arm Limited and Contributors. All rights reserved. * - * SPDX-License-Identifier: BSD-3-Clause OR Arm’s non-OSI source license + * SPDX-License-Identifier: BSD-3-Clause */ #ifndef MBEDTLS_THREADING_ALT_H @@ -11,9 +11,9 @@ #include "nrf_cc3xx_platform_mutex.h" /** @brief Alternate declaration of mbedtls mutex type - * + * * The RTOS may require allocation and freeing of resources - * as the inner type of the mutex is represented by an + * as the inner type of the mutex is represented by an * RTOS-friendly void pointer. */ typedef nrf_cc3xx_platform_mutex_t mbedtls_threading_mutex_t;