Skip to content

Commit 47abbf3

Browse files
LDong-ArmLDong-Arm
committed
Import mbedtls-2.24 and Mbed PSA Service (non-TFM)
Files have been automatically imported by setting MBED_TLS_RELEASE to mbedtls-2.24.0 in connectivity/mbedtls/tools/importer/Makefile and running `make` in that directory.
1 parent afad91d commit 47abbf3

File tree

187 files changed

+5010
-3277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+5010
-3277
lines changed

‎connectivity/mbedtls/include/mbedtls/aes.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
* <https://ieeexplore.ieee.org/servlet/opac?punumber=4375278>.
2121
*/
2222

23-
/* Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved.
23+
/*
24+
* Copyright The Mbed TLS Contributors
2425
* SPDX-License-Identifier: Apache-2.0
2526
*
2627
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -34,8 +35,6 @@
3435
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3536
* See the License for the specific language governing permissions and
3637
* limitations under the License.
37-
*
38-
* This file is part of Mbed TLS (https://tls.mbed.org)
3938
*/
4039

4140
#ifndef MBEDTLS_AES_H

‎connectivity/mbedtls/include/mbedtls/aesni.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* functions; you must not call them directly.
88
*/
99
/*
10-
* Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
10+
* Copyright The Mbed TLS Contributors
1111
* SPDX-License-Identifier: Apache-2.0
1212
*
1313
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -21,8 +21,6 @@
2121
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
2222
* See the License for the specific language governing permissions and
2323
* limitations under the License.
24-
*
25-
* This file is part of mbed TLS (https://tls.mbed.org)
2624
*/
2725
#ifndef MBEDTLS_AESNI_H
2826
#define MBEDTLS_AESNI_H

‎connectivity/mbedtls/include/mbedtls/arc4.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* security risk. We recommend considering stronger ciphers instead.
88
*/
99
/*
10-
* Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
10+
* Copyright The Mbed TLS Contributors
1111
* SPDX-License-Identifier: Apache-2.0
1212
*
1313
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -22,8 +22,6 @@
2222
* See the License for the specific language governing permissions and
2323
* limitations under the License.
2424
*
25-
* This file is part of mbed TLS (https://tls.mbed.org)
26-
*
2725
*/
2826
#ifndef MBEDTLS_ARC4_H
2927
#define MBEDTLS_ARC4_H

‎connectivity/mbedtls/include/mbedtls/aria.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
* Korean, but see http://210.104.33.10/ARIA/index-e.html in English)
1010
* and also described by the IETF in <em>RFC 5794</em>.
1111
*/
12-
/* Copyright (C) 2006-2018, ARM Limited, All Rights Reserved
12+
/*
13+
* Copyright The Mbed TLS Contributors
1314
* SPDX-License-Identifier: Apache-2.0
1415
*
1516
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -23,8 +24,6 @@
2324
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
2425
* See the License for the specific language governing permissions and
2526
* limitations under the License.
26-
*
27-
* This file is part of mbed TLS (https://tls.mbed.org)
2827
*/
2928

3029
#ifndef MBEDTLS_ARIA_H

‎connectivity/mbedtls/include/mbedtls/asn1.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* \brief Generic ASN.1 parsing
55
*/
66
/*
7-
* Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
7+
* Copyright The Mbed TLS Contributors
88
* SPDX-License-Identifier: Apache-2.0
99
*
1010
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -18,8 +18,6 @@
1818
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1919
* See the License for the specific language governing permissions and
2020
* limitations under the License.
21-
*
22-
* This file is part of mbed TLS (https://tls.mbed.org)
2321
*/
2422
#ifndef MBEDTLS_ASN1_H
2523
#define MBEDTLS_ASN1_H

‎connectivity/mbedtls/include/mbedtls/asn1write.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* \brief ASN.1 buffer writing functionality
55
*/
66
/*
7-
* Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
7+
* Copyright The Mbed TLS Contributors
88
* SPDX-License-Identifier: Apache-2.0
99
*
1010
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -18,8 +18,6 @@
1818
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1919
* See the License for the specific language governing permissions and
2020
* limitations under the License.
21-
*
22-
* This file is part of mbed TLS (https://tls.mbed.org)
2321
*/
2422
#ifndef MBEDTLS_ASN1_WRITE_H
2523
#define MBEDTLS_ASN1_WRITE_H

‎connectivity/mbedtls/include/mbedtls/base64.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* \brief RFC 1521 base64 encoding/decoding
55
*/
66
/*
7-
* Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
7+
* Copyright The Mbed TLS Contributors
88
* SPDX-License-Identifier: Apache-2.0
99
*
1010
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -18,8 +18,6 @@
1818
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1919
* See the License for the specific language governing permissions and
2020
* limitations under the License.
21-
*
22-
* This file is part of mbed TLS (https://tls.mbed.org)
2321
*/
2422
#ifndef MBEDTLS_BASE64_H
2523
#define MBEDTLS_BASE64_H

‎connectivity/mbedtls/include/mbedtls/bignum.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* \brief Multi-precision integer library
55
*/
66
/*
7-
* Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
7+
* Copyright The Mbed TLS Contributors
88
* SPDX-License-Identifier: Apache-2.0
99
*
1010
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -18,8 +18,6 @@
1818
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1919
* See the License for the specific language governing permissions and
2020
* limitations under the License.
21-
*
22-
* This file is part of mbed TLS (https://tls.mbed.org)
2321
*/
2422
#ifndef MBEDTLS_BIGNUM_H
2523
#define MBEDTLS_BIGNUM_H

‎connectivity/mbedtls/include/mbedtls/blowfish.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* \brief Blowfish block cipher
55
*/
66
/*
7-
* Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
7+
* Copyright The Mbed TLS Contributors
88
* SPDX-License-Identifier: Apache-2.0
99
*
1010
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -18,8 +18,6 @@
1818
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1919
* See the License for the specific language governing permissions and
2020
* limitations under the License.
21-
*
22-
* This file is part of mbed TLS (https://tls.mbed.org)
2321
*/
2422
#ifndef MBEDTLS_BLOWFISH_H
2523
#define MBEDTLS_BLOWFISH_H

‎connectivity/mbedtls/include/mbedtls/bn_mul.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* \brief Multi-precision integer library
55
*/
66
/*
7-
* Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
7+
* Copyright The Mbed TLS Contributors
88
* SPDX-License-Identifier: Apache-2.0
99
*
1010
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -18,8 +18,6 @@
1818
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1919
* See the License for the specific language governing permissions and
2020
* limitations under the License.
21-
*
22-
* This file is part of mbed TLS (https://tls.mbed.org)
2321
*/
2422
/*
2523
* Multiply source vector [s] with b, add result

‎connectivity/mbedtls/include/mbedtls/camellia.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* \brief Camellia block cipher
55
*/
66
/*
7-
* Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
7+
* Copyright The Mbed TLS Contributors
88
* SPDX-License-Identifier: Apache-2.0
99
*
1010
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -18,8 +18,6 @@
1818
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1919
* See the License for the specific language governing permissions and
2020
* limitations under the License.
21-
*
22-
* This file is part of mbed TLS (https://tls.mbed.org)
2321
*/
2422
#ifndef MBEDTLS_CAMELLIA_H
2523
#define MBEDTLS_CAMELLIA_H

‎connectivity/mbedtls/include/mbedtls/ccm.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* consistent with RFC 3610.
2929
*/
3030
/*
31-
* Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved
31+
* Copyright The Mbed TLS Contributors
3232
* SPDX-License-Identifier: Apache-2.0
3333
*
3434
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -42,8 +42,6 @@
4242
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
4343
* See the License for the specific language governing permissions and
4444
* limitations under the License.
45-
*
46-
* This file is part of Mbed TLS (https://tls.mbed.org)
4745
*/
4846

4947
#ifndef MBEDTLS_CCM_H

‎connectivity/mbedtls/include/mbedtls/certs.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* \brief Sample certificates and DHM parameters for testing
55
*/
66
/*
7-
* Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
7+
* Copyright The Mbed TLS Contributors
88
* SPDX-License-Identifier: Apache-2.0
99
*
1010
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -18,8 +18,6 @@
1818
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1919
* See the License for the specific language governing permissions and
2020
* limitations under the License.
21-
*
22-
* This file is part of mbed TLS (https://tls.mbed.org)
2321
*/
2422
#ifndef MBEDTLS_CERTS_H
2523
#define MBEDTLS_CERTS_H

‎connectivity/mbedtls/include/mbedtls/chacha20.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
* \author Daniel King <[email protected]>
1313
*/
1414

15-
/* Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved.
15+
/*
16+
* Copyright The Mbed TLS Contributors
1617
* SPDX-License-Identifier: Apache-2.0
1718
*
1819
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -26,8 +27,6 @@
2627
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
2728
* See the License for the specific language governing permissions and
2829
* limitations under the License.
29-
*
30-
* This file is part of Mbed TLS (https://tls.mbed.org)
3130
*/
3231

3332
#ifndef MBEDTLS_CHACHA20_H

‎connectivity/mbedtls/include/mbedtls/chachapoly.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
* \author Daniel King <[email protected]>
1313
*/
1414

15-
/* Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved.
15+
/*
16+
* Copyright The Mbed TLS Contributors
1617
* SPDX-License-Identifier: Apache-2.0
1718
*
1819
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -26,8 +27,6 @@
2627
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
2728
* See the License for the specific language governing permissions and
2829
* limitations under the License.
29-
*
30-
* This file is part of Mbed TLS (https://tls.mbed.org)
3130
*/
3231

3332
#ifndef MBEDTLS_CHACHAPOLY_H

‎connectivity/mbedtls/include/mbedtls/check_config.h

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* \brief Consistency checks for configuration options
55
*/
66
/*
7-
* Copyright (C) 2006-2018, ARM Limited, All Rights Reserved
7+
* Copyright The Mbed TLS Contributors
88
* SPDX-License-Identifier: Apache-2.0
99
*
1010
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -18,8 +18,6 @@
1818
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1919
* See the License for the specific language governing permissions and
2020
* limitations under the License.
21-
*
22-
* This file is part of mbed TLS (https://tls.mbed.org)
2321
*/
2422

2523
/*
@@ -103,6 +101,17 @@
103101

104102
#if defined(MBEDTLS_ECDSA_C) && \
105103
( !defined(MBEDTLS_ECP_C) || \
104+
!( defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED) || \
105+
defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED) || \
106+
defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED) || \
107+
defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED) || \
108+
defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED) || \
109+
defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED) || \
110+
defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED) || \
111+
defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED) || \
112+
defined(MBEDTLS_ECP_DP_BP256R1_ENABLED) || \
113+
defined(MBEDTLS_ECP_DP_BP384R1_ENABLED) || \
114+
defined(MBEDTLS_ECP_DP_BP512R1_ENABLED) ) || \
106115
!defined(MBEDTLS_ASN1_PARSE_C) || \
107116
!defined(MBEDTLS_ASN1_WRITE_C) )
108117
#error "MBEDTLS_ECDSA_C defined, but not all prerequisites"
@@ -156,6 +165,14 @@
156165
#error "MBEDTLS_ECP_C defined, but not all prerequisites"
157166
#endif
158167

168+
#if defined(MBEDTLS_ECP_C) && !( \
169+
defined(MBEDTLS_ECP_ALT) || \
170+
defined(MBEDTLS_CTR_DRBG_C) || \
171+
defined(MBEDTLS_HMAC_DRBG_C) || \
172+
defined(MBEDTLS_ECP_NO_INTERNAL_RNG))
173+
#error "MBEDTLS_ECP_C requires a DRBG module unless MBEDTLS_ECP_NO_INTERNAL_RNG is defined or an alternative implementation is used"
174+
#endif
175+
159176
#if defined(MBEDTLS_PK_PARSE_C) && !defined(MBEDTLS_ASN1_PARSE_C)
160177
#error "MBEDTLS_PK_PARSE_C defined, but not all prerequesites"
161178
#endif
@@ -178,6 +195,16 @@
178195
#error "MBEDTLS_ENTROPY_FORCE_SHA256 defined, but not all prerequisites"
179196
#endif
180197

198+
#if defined(__has_feature)
199+
#if __has_feature(memory_sanitizer)
200+
#define MBEDTLS_HAS_MEMSAN
201+
#endif
202+
#endif
203+
#if defined(MBEDTLS_TEST_CONSTANT_FLOW_MEMSAN) && !defined(MBEDTLS_HAS_MEMSAN)
204+
#error "MBEDTLS_TEST_CONSTANT_FLOW_MEMSAN requires building with MemorySanitizer"
205+
#endif
206+
#undef MBEDTLS_HAS_MEMSAN
207+
181208
#if defined(MBEDTLS_TEST_NULL_ENTROPY) && \
182209
( !defined(MBEDTLS_ENTROPY_C) || !defined(MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES) )
183210
#error "MBEDTLS_TEST_NULL_ENTROPY defined, but not all prerequisites"
@@ -238,12 +265,14 @@
238265
#endif
239266

240267
#if defined(MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED) && \
241-
( !defined(MBEDTLS_ECDH_C) || !defined(MBEDTLS_X509_CRT_PARSE_C) )
268+
( !defined(MBEDTLS_ECDH_C) || !defined(MBEDTLS_ECDSA_C) || \
269+
!defined(MBEDTLS_X509_CRT_PARSE_C) )
242270
#error "MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED defined, but not all prerequisites"
243271
#endif
244272

245273
#if defined(MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED) && \
246-
( !defined(MBEDTLS_ECDH_C) || !defined(MBEDTLS_X509_CRT_PARSE_C) )
274+
( !defined(MBEDTLS_ECDH_C) || !defined(MBEDTLS_RSA_C) || \
275+
!defined(MBEDTLS_X509_CRT_PARSE_C) )
247276
#error "MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED defined, but not all prerequisites"
248277
#endif
249278

@@ -614,6 +643,11 @@
614643
#error "MBEDTLS_SSL_PROTO_TLS1_2 defined, but not all prerequisites"
615644
#endif
616645

646+
#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL) && ( !defined(MBEDTLS_HKDF_C) && \
647+
!defined(MBEDTLS_SHA256_C) && !defined(MBEDTLS_SHA512_C) )
648+
#error "MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL defined, but not all prerequisites"
649+
#endif
650+
617651
#if (defined(MBEDTLS_SSL_PROTO_SSL3) || defined(MBEDTLS_SSL_PROTO_TLS1) || \
618652
defined(MBEDTLS_SSL_PROTO_TLS1_1) || defined(MBEDTLS_SSL_PROTO_TLS1_2)) && \
619653
!(defined(MBEDTLS_KEY_EXCHANGE_RSA_ENABLED) || \

‎connectivity/mbedtls/include/mbedtls/cipher.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* \author Adriaan de Jong <[email protected]>
99
*/
1010
/*
11-
* Copyright (C) 2006-2018, Arm Limited (or its affiliates), All Rights Reserved
11+
* Copyright The Mbed TLS Contributors
1212
* SPDX-License-Identifier: Apache-2.0
1313
*
1414
* Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -22,8 +22,6 @@
2222
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
2323
* See the License for the specific language governing permissions and
2424
* limitations under the License.
25-
*
26-
* This file is part of Mbed TLS (https://tls.mbed.org)
2725
*/
2826

2927
#ifndef MBEDTLS_CIPHER_H

0 commit comments

Comments
 (0)