Skip to content

Commit af4c8a9

Browse files
authored
Merge pull request #12757 from dgreen-arm/test-remerge
Update Mbed OS with Mbed Crypto merged into Mbed TLS
2 parents 930ef84 + 7fbc143 commit af4c8a9

File tree

180 files changed

+8675
-7558
lines changed

Some content is hidden

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

180 files changed

+8675
-7558
lines changed

TESTS/configs/baremetal.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"utest",
66
"unity",
77
"psa",
8-
"mbed-crypto",
98
"mbedtls",
109
"psa-compliance-framework",
1110
"filesystem",
File renamed without changes.

TESTS/psa/attestation/main.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,29 +95,29 @@ static void check_initial_attestation_get_token()
9595
uint32_t token_size;
9696

9797
status = psa_crypto_init();
98-
TEST_ASSERT_EQUAL(status, PSA_SUCCESS);
98+
TEST_ASSERT_EQUAL(PSA_SUCCESS, status);
9999
status = psa_attestation_inject_key(private_key_data,
100100
sizeof(private_key_data),
101-
PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_CURVE_SECP256R1),
101+
PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_CURVE_SECP_R1),
102102
exported,
103103
sizeof(exported),
104104
&exported_length);
105105

106-
TEST_ASSERT_EQUAL(status, PSA_SUCCESS);
106+
TEST_ASSERT_EQUAL(PSA_SUCCESS, status);
107107
TEST_ASSERT_EQUAL(sizeof(public_key_data), exported_length);
108-
TEST_ASSERT_EQUAL(memcmp(public_key_data, exported, exported_length), 0);
108+
TEST_ASSERT_EQUAL(0, memcmp(public_key_data, exported, exported_length));
109109

110110
attest_err = psa_initial_attest_get_token_size(TEST_CHALLENGE_OBJ_SIZE,
111111
&token_size);
112112

113-
TEST_ASSERT_EQUAL(attest_err, PSA_ATTEST_ERR_SUCCESS);
113+
TEST_ASSERT_EQUAL(PSA_ATTEST_ERR_SUCCESS, attest_err);
114114

115115
attest_err = psa_initial_attest_get_token(challenge_buffer,
116116
TEST_CHALLENGE_OBJ_SIZE,
117117
token_buffer,
118118
&token_size);
119119

120-
TEST_ASSERT_EQUAL(attest_err, PSA_ATTEST_ERR_SUCCESS);
120+
TEST_ASSERT_EQUAL(PSA_ATTEST_ERR_SUCCESS, attest_err);
121121
}
122122
/***************************************************************************************/
123123

UNITTESTS/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ set(unittest-includes-base
144144
"${PROJECT_SOURCE_DIR}/../features/lorawan/system"
145145
"${PROJECT_SOURCE_DIR}/../features/mbedtls"
146146
"${PROJECT_SOURCE_DIR}/../features/mbedtls/inc"
147-
"${PROJECT_SOURCE_DIR}/../features/mbedtls/mbed-crypto/inc"
148147
"${PROJECT_SOURCE_DIR}/../features/storage/kvstore/conf"
149148
)
150149

UNITTESTS/empty_baseline/unittest.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
set(unittest-includes ${unittest-includes}
77
.
88
..
9-
../features/mbedtls/mbed-crypto/inc/mbedtls/
9+
../features/mbedtls/inc/mbedtls/
1010
../features/mbedtls/platform/inc/
1111
../features/frameworks/mbed-trace/mbed-trace/
1212
)

components/TARGET_PSA/services/COMPONENT_PSA_SRV_IMPL/mbed_lib.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"drivers",
55
"platform",
66
"mbedtls",
7-
"mbed-crypto",
87
"storage",
98
"flashiap-block-device",
109
"tdbstore",

components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/attest_crypto_keys.c

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,12 @@ static psa_status_t get_curve(psa_key_type_t type, enum ecc_curve_t *curve_type)
4848
{
4949
psa_ecc_curve_t curve = PSA_KEY_TYPE_GET_CURVE(type);
5050
switch (curve) {
51-
case PSA_ECC_CURVE_SECP256R1:
51+
case PSA_ECC_CURVE_SECP_R1:
5252
*curve_type = P_256;
5353
break;
54-
case PSA_ECC_CURVE_SECP384R1:
55-
*curve_type = P_384;
56-
break;
57-
case PSA_ECC_CURVE_SECP521R1:
58-
*curve_type = P_521;
59-
break;
60-
case PSA_ECC_CURVE_CURVE25519:
54+
case PSA_ECC_CURVE_MONTGOMERY:
6155
*curve_type = X25519;
6256
break;
63-
case PSA_ECC_CURVE_CURVE448:
64-
*curve_type = X448;
65-
break;
6657
default:
6758
return (PSA_ERROR_NOT_SUPPORTED);
6859
}

features/frameworks/TARGET_PSA/pal/pal_mbed_os_intf.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static void psa_attestation_inject_key_for_test(void)
6363
psa_attestation_destroy_key_for_test();
6464
psa_attestation_inject_key(private_key_data,
6565
sizeof(private_key_data),
66-
PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_CURVE_SECP256R1),
66+
PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_CURVE_SECP_R1),
6767
exported,
6868
sizeof(exported),
6969
&exported_length);

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.20.0d1
1+
mbedtls-2.22.0

features/mbedtls/importer/Makefile

Lines changed: 27 additions & 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.20.0d1
30+
MBED_TLS_RELEASE ?= mbedtls-2.22.0
3131
MBED_TLS_REPO_URL ?= git@github.com:ARMmbed/mbedtls.git
3232

3333
# Translate between mbed TLS namespace and mbed namespace
@@ -36,9 +36,20 @@ TARGET_SRC:=$(TARGET_PREFIX)src
3636
TARGET_INC:=$(TARGET_PREFIX)inc
3737
TARGET_TESTS:=$(TARGET_PREFIX)TESTS
3838

39+
# A folder structure is introduced here for targets that have both a Secure
40+
# Processing Environment (SPE) targets and Non-secure Processing Environment
41+
# (NSPE). Documentation for each folder as follows:
42+
# COMPONENT_PSA_SRV_IMPL - Include secure service implementation code. For
43+
# example PSA Crypto or PSA Secure Time implementations
44+
TARGET_SRV_IMPL:=$(TARGET_PREFIX)/platform/COMPONENT_PSA_SRV_IMPL
45+
# COMPONENT_NSPE - Include code that compiles ONLY to the NSPE image and never
46+
# compiles to the SPE image
47+
TARGET_NSPE:=$(TARGET_SRV_IMPL)/COMPONENT_NSPE
48+
3949
# mbed TLS source directory - hidden from mbed via TARGET_IGNORE
4050
MBED_TLS_DIR:=TARGET_IGNORE/mbedtls
4151
MBED_TLS_API:=$(MBED_TLS_DIR)/include/mbedtls
52+
CRYPTO_API:=$(MBED_TLS_DIR)/include/psa
4253
MBED_TLS_GIT_CFG=$(MBED_TLS_DIR)/.git/config
4354

4455
.PHONY: all deploy deploy-tests rsync mbedtls clean update
@@ -57,10 +68,24 @@ rsync:
5768
rm -rf $(TARGET_INC)
5869
mkdir -p $(TARGET_INC)
5970
rsync -a --delete $(MBED_TLS_API) $(TARGET_INC)
71+
rsync -a --delete --exclude='crypto_struct.h' $(CRYPTO_API) $(TARGET_INC)/
6072
#
6173
# Copying licenses
6274
cp $(MBED_TLS_DIR)/LICENSE $(TARGET_PREFIX)
6375
#
76+
# Copying Mbed Crypto into Mbed OS...
77+
rm -rf $(TARGET_SRV_IMPL)
78+
79+
mkdir -p $(TARGET_SRV_IMPL)
80+
mkdir -p $(TARGET_NSPE)
81+
82+
rsync -a --delete $(CRYPTO_API)/crypto_struct.h $(TARGET_NSPE)/
83+
rsync -a --delete $(MBED_TLS_DIR)/library/psa_*.c $(TARGET_SRV_IMPL)/
84+
rsync -a --delete $(MBED_TLS_DIR)/library/psa_*.h $(TARGET_SRV_IMPL)/
85+
#
86+
# Remove PSA-specific C & H files (they go into $(TARGET_SRV_IMPL))
87+
rm -rf $(TARGET_SRC)/psa_*.c
88+
rm -rf $(TARGET_SRC)/psa_*.h
6489

6590
deploy: rsync
6691
#
@@ -110,3 +135,4 @@ clean:
110135
rm -rf $(TARGET_SRC)
111136
rm -rf $(TARGET_INC)
112137
rm -rf $(MBED_TLS_DIR)
138+
rm -rf $(TARGET_SRV_IMPL)

features/mbedtls/importer/adjust-config.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ conf unset MBEDTLS_TIMING_C
7979
# not supported on all targets with mbed OS, nor used by mbed Client
8080
conf unset MBEDTLS_HAVE_TIME_DATE
8181
conf unset MBEDTLS_FS_IO
82+
conf unset MBEDTLS_PSA_ITS_FILE_C
83+
conf unset MBEDTLS_PSA_CRYPTO_STORAGE_C
8284
conf set MBEDTLS_NO_PLATFORM_ENTROPY
8385

8486
conf unset MBEDTLS_CIPHER_MODE_CFB

0 commit comments

Comments
 (0)