Skip to content

Commit 71d213d

Browse files
dgreen-armPatater
authored andcommitted
Update Mbed TLS to latest version
As Mbed Crypto has been remerged into Mbed TLS, remove Mbed Crypto at the same time. Signed-off-by: Darryl Green <[email protected]>
1 parent 7cf7f2e commit 71d213d

File tree

167 files changed

+1126
-694
lines changed

Some content is hidden

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

167 files changed

+1126
-694
lines changed

features/mbedtls/LICENSE

Lines changed: 202 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,202 @@
1-
Unless specifically indicated otherwise in a file, files are licensed
2-
under the Apache 2.0 license, as can be found in: apache-2.0.txt
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

features/mbedtls/VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
mbedtls-2.21.0
1+
mbedtls-2.22.0

features/mbedtls/importer/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#
2828

2929
# Set the mbed TLS release to import (this can/should be edited before import)
30-
MBED_TLS_RELEASE ?= mbedtls-2.21.0
30+
MBED_TLS_RELEASE ?= mbedtls-2.22.0
3131
MBED_TLS_REPO_URL ?= [email protected]:ARMmbed/mbedtls.git
3232

3333
# Translate between mbed TLS namespace and mbed namespace

features/mbedtls/mbed-crypto/inc/mbedtls/asn1.h renamed to features/mbedtls/inc/mbedtls/asn1.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
* - 0x02 -- tag indicating INTEGER
6767
* - 0x01 -- length in octets
6868
* - 0x05 -- value
69-
* Such sequences are typically read into Mbed TLS's \c mbedtls_x509_buf.
69+
* Such sequences are typically read into \c ::mbedtls_x509_buf.
7070
* \{
7171
*/
7272
#define MBEDTLS_ASN1_BOOLEAN 0x01

features/mbedtls/inc/mbedtls/check_config.h

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
#endif
190190

191191
#if defined(MBEDTLS_GCM_C) && ( \
192-
!defined(MBEDTLS_AES_C) && !defined(MBEDTLS_CAMELLIA_C) )
192+
!defined(MBEDTLS_AES_C) && !defined(MBEDTLS_CAMELLIA_C) && !defined(MBEDTLS_ARIA_C) )
193193
#error "MBEDTLS_GCM_C defined, but not all prerequisites"
194194
#endif
195195

@@ -292,7 +292,7 @@
292292
#error "MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED defined, but not all prerequisites"
293293
#endif
294294

295-
#if defined(MBEDTLS_KEY_EXCHANGE__WITH_CERT__ENABLED) && \
295+
#if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED) && \
296296
!defined(MBEDTLS_SSL_KEEP_PEER_CERTIFICATE) && \
297297
( !defined(MBEDTLS_SHA256_C) && \
298298
!defined(MBEDTLS_SHA512_C) && \
@@ -553,6 +553,12 @@
553553
#error "MBEDTLS_PSA_CRYPTO_SPM defined, but not all prerequisites"
554554
#endif
555555

556+
#if defined(MBEDTLS_PSA_CRYPTO_SE_C) && \
557+
! ( defined(MBEDTLS_PSA_CRYPTO_C) && \
558+
defined(MBEDTLS_PSA_CRYPTO_STORAGE_C) )
559+
#error "MBEDTLS_PSA_CRYPTO_SE_C defined, but not all prerequisites"
560+
#endif
561+
556562
#if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C) && \
557563
! defined(MBEDTLS_PSA_CRYPTO_C)
558564
#error "MBEDTLS_PSA_CRYPTO_STORAGE_C defined, but not all prerequisites"
@@ -584,6 +590,10 @@
584590
#error "MBEDTLS_X509_RSASSA_PSS_SUPPORT defined, but not all prerequisites"
585591
#endif
586592

593+
#if defined(MBEDTLS_SHA512_NO_SHA384) && !defined(MBEDTLS_SHA512_C)
594+
#error "MBEDTLS_SHA512_NO_SHA384 defined without MBEDTLS_SHA512_C"
595+
#endif
596+
587597
#if defined(MBEDTLS_SSL_PROTO_SSL3) && ( !defined(MBEDTLS_MD5_C) || \
588598
!defined(MBEDTLS_SHA1_C) )
589599
#error "MBEDTLS_SSL_PROTO_SSL3 defined, but not all prerequisites"
@@ -604,6 +614,23 @@
604614
#error "MBEDTLS_SSL_PROTO_TLS1_2 defined, but not all prerequisites"
605615
#endif
606616

617+
#if (defined(MBEDTLS_SSL_PROTO_SSL3) || defined(MBEDTLS_SSL_PROTO_TLS1) || \
618+
defined(MBEDTLS_SSL_PROTO_TLS1_1) || defined(MBEDTLS_SSL_PROTO_TLS1_2)) && \
619+
!(defined(MBEDTLS_KEY_EXCHANGE_RSA_ENABLED) || \
620+
defined(MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED) || \
621+
defined(MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED) || \
622+
defined(MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED) || \
623+
defined(MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED) || \
624+
defined(MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED) || \
625+
defined(MBEDTLS_KEY_EXCHANGE_PSK_ENABLED) || \
626+
defined(MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED) || \
627+
defined(MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED) || \
628+
defined(MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED) || \
629+
defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED) )
630+
#error "One or more versions of the TLS protocol are enabled " \
631+
"but no key exchange methods defined with MBEDTLS_KEY_EXCHANGE_xxxx"
632+
#endif
633+
607634
#if defined(MBEDTLS_SSL_PROTO_DTLS) && \
608635
!defined(MBEDTLS_SSL_PROTO_TLS1_1) && \
609636
!defined(MBEDTLS_SSL_PROTO_TLS1_2)
@@ -748,6 +775,10 @@
748775
#error "MBEDTLS_X509_CREATE_C defined, but not all prerequisites"
749776
#endif
750777

778+
#if defined(MBEDTLS_CERTS_C) && !defined(MBEDTLS_X509_USE_C)
779+
#error "MBEDTLS_CERTS_C defined, but not all prerequisites"
780+
#endif
781+
751782
#if defined(MBEDTLS_X509_CRT_PARSE_C) && ( !defined(MBEDTLS_X509_USE_C) )
752783
#error "MBEDTLS_X509_CRT_PARSE_C defined, but not all prerequisites"
753784
#endif
@@ -793,6 +824,14 @@
793824
#endif
794825
#endif /* MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO */
795826

827+
#if defined(MBEDTLS_SSL_HW_RECORD_ACCEL)
828+
#if defined(MBEDTLS_DEPRECATED_REMOVED)
829+
#error "MBEDTLS_SSL_HW_RECORD_ACCEL is deprecated and will be removed in a future version of Mbed TLS"
830+
#elif defined(MBEDTLS_DEPRECATED_WARNING)
831+
#warning "MBEDTLS_SSL_HW_RECORD_ACCEL is deprecated and will be removed in a future version of Mbed TLS"
832+
#endif /* MBEDTLS_DEPRECATED_REMOVED */
833+
#endif /* MBEDTLS_SSL_HW_RECORD_ACCEL */
834+
796835
/*
797836
* Avoid warning from -pedantic. This is a convenient place for this
798837
* workaround since this is included by every single file before the

features/mbedtls/inc/mbedtls/compat-1.3.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,9 +1250,9 @@
12501250
#define POLARSSL_KEY_EXCHANGE_PSK MBEDTLS_KEY_EXCHANGE_PSK
12511251
#define POLARSSL_KEY_EXCHANGE_RSA MBEDTLS_KEY_EXCHANGE_RSA
12521252
#define POLARSSL_KEY_EXCHANGE_RSA_PSK MBEDTLS_KEY_EXCHANGE_RSA_PSK
1253-
#define POLARSSL_KEY_EXCHANGE__SOME__ECDHE_ENABLED MBEDTLS_KEY_EXCHANGE__SOME__ECDHE_ENABLED
1254-
#define POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED
1255-
#define POLARSSL_KEY_EXCHANGE__WITH_CERT__ENABLED MBEDTLS_KEY_EXCHANGE__WITH_CERT__ENABLED
1253+
#define POLARSSL_KEY_EXCHANGE__SOME__ECDHE_ENABLED MBEDTLS_KEY_EXCHANGE_SOME_ECDHE_ENABLED
1254+
#define POLARSSL_KEY_EXCHANGE__SOME__PSK_ENABLED MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED
1255+
#define POLARSSL_KEY_EXCHANGE__WITH_CERT__ENABLED MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED
12561256
#define POLARSSL_KEY_LENGTH_DES MBEDTLS_KEY_LENGTH_DES
12571257
#define POLARSSL_KEY_LENGTH_DES_EDE MBEDTLS_KEY_LENGTH_DES_EDE
12581258
#define POLARSSL_KEY_LENGTH_DES_EDE3 MBEDTLS_KEY_LENGTH_DES_EDE3

features/mbedtls/inc/mbedtls/config-no-entropy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,6 @@
8787
/* Miscellaneous options */
8888
#define MBEDTLS_AES_ROM_TABLES
8989

90-
#include "check_config.h"
90+
#include "mbedtls/check_config.h"
9191

9292
#endif /* MBEDTLS_CONFIG_H */

0 commit comments

Comments
 (0)