Skip to content

Commit 48ce926

Browse files
sg-sg-
committed
Merge pull request #238 from sbutcher-arm/import-mbedtls
Integration of mbed TLS and import script
2 parents 0d437f2 + 82fbdec commit 48ce926

Some content is hidden

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

145 files changed

+83196
-1
lines changed

‎core/mbedtls/LICENSE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
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

‎core/mbedtls/VERSION.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
yotta-2.3.0-156-g184eea6aa06aa4fadd22b5eaad0aa729156d83d9

‎core/mbedtls/apache-2.0.txt

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
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.

‎core/mbedtls/importer/Makefile

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
###########################################################################
2+
#
3+
# Copyright (c) 2016, ARM Limited, All Rights Reserved
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License"); you may
7+
# not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
14+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
###########################################################################
19+
20+
#
21+
# Use this file to import an mbed TLS release into mbed-OS as follows:
22+
#
23+
# 1) Set the MBED_TLS_RELEASE variable to the required mbed TLS release tag
24+
# 2) make update
25+
# 3) make
26+
# 4) commit and push changes via git
27+
#
28+
29+
# Set the mbed TLS release to import (this can/should be edited before import)
30+
MBED_TLS_RELEASE ?= mbedtls-2.2.1
31+
32+
# Translate between mbed TLS namespace and mbed namespace
33+
TARGET_PREFIX:=../
34+
TARGET_SRC:=$(TARGET_PREFIX)src
35+
TARGET_INC:=$(TARGET_PREFIX)inc
36+
37+
# mbed TLS source directory - hidden from mbed via TARGET_IGNORE
38+
MBED_TLS_URL:=https://github.com/ARMmbed/mbedtls.git
39+
MBED_TLS_DIR:=TARGET_IGNORE/mbedtls
40+
MBED_TLS_API:=$(MBED_TLS_DIR)/include/mbedtls
41+
MBED_TLS_GIT_CFG=$(MBED_TLS_DIR)/.git/config
42+
43+
.PHONY: all deploy rsync mbedtls clean update
44+
45+
all: mbedtls
46+
47+
mbedtls: deploy
48+
49+
rsync:
50+
#
51+
# Copying mbed TLS into mbed library...
52+
rm -rf $(TARGET_SRC)
53+
rsync -a --exclude='*.txt' $(MBED_TLS_DIR)/library/ $(TARGET_SRC)
54+
#
55+
# Copying mbed TLS headers to mbed includes...
56+
rm -rf $(TARGET_INC)
57+
mkdir -p $(TARGET_INC)
58+
rsync -a --delete $(MBED_TLS_API) $(TARGET_INC)
59+
#
60+
# Copying licenses
61+
cp $(MBED_TLS_DIR)/LICENSE $(TARGET_PREFIX)
62+
cp $(MBED_TLS_DIR)/apache-2.0.txt $(TARGET_PREFIX)
63+
#
64+
65+
deploy: rsync
66+
#
67+
# Adjusting the default mbed TLS config file to mbed purposes
68+
./adjust-config.sh $(MBED_TLS_DIR)/scripts/config.pl $(TARGET_INC)/mbedtls/config.h
69+
70+
update: $(MBED_TLS_GIT_CFG) $(MBED_TLS_HA_GIT_CFG)
71+
#
72+
# Updating to the specified mbed TLS library version
73+
# (If it is not an initial checkout we will start with the repository
74+
# being in a detached head state)
75+
git -C $(MBED_TLS_DIR) checkout development
76+
git -C $(MBED_TLS_DIR) pull --rebase origin development
77+
#
78+
# Checking out the required release
79+
git -C $(MBED_TLS_DIR) checkout $(MBED_TLS_RELEASE)
80+
#
81+
# Updating checked out version tag
82+
git -C $(MBED_TLS_DIR) describe --tags --abbrev=40 --dirty > $(TARGET_PREFIX)VERSION.txt
83+
84+
$(MBED_TLS_GIT_CFG):
85+
rm -rf $(MBED_TLS_DIR)
86+
git clone $(MBED_TLS_URL) $(MBED_TLS_DIR)
87+
88+
clean:
89+
rm -f $(TARGET_PREFIX)LICENSE
90+
rm -f $(TARGET_PREFIX)apache-2.0.txt
91+
rm -f $(TARGET_PREFIX)VERSION.txt
92+
rm -f $(TARGET_PREFIX)AUTHORS.txt
93+
rm -rf $(TARGET_PREFIX)/targets
94+
rm -rf $(TARGET_SRC)
95+
rm -rf $(TARGET_INC)
96+
rm -rf $(MBED_TLS_DIR)
97+

‎core/mbedtls/importer/TARGET_IGNORE/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
mbedtls
2+
mbed-tls-lib

‎core/mbedtls/importer/adjust-config.sh

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
#!/bin/sh
2+
#
3+
# This file is part of mbed TLS (https://tls.mbed.org)
4+
#
5+
# Copyright (c) 2015-2016, ARM Limited, All Rights Reserved
6+
#
7+
# Purpose
8+
#
9+
# Comments and uncomments #define lines in the given configuration header file
10+
# to configure the file for use in mbed OS.
11+
#
12+
# Usage: adjust-config.sh [path to config script] [path to config file]
13+
#
14+
set -eu
15+
16+
if [ $# -ne 2 ]; then
17+
echo "Usage: $0 path/to/config.pl path/to/config.h" >&2
18+
exit 1
19+
fi
20+
21+
SCRIPT=$1
22+
FILE=$2
23+
24+
conf() {
25+
$SCRIPT -f $FILE $@
26+
}
27+
28+
# not supported on mbed OS, nor used by mbed Client
29+
conf unset MBEDTLS_NET_C
30+
conf unset MBEDTLS_TIMING_C
31+
32+
# not supported on all targets with mbed OS, nor used by mbed Client
33+
conf unset MBEDTLS_HAVE_TIME_DATE
34+
conf unset MBEDTLS_FS_IO
35+
conf set MBEDTLS_NO_PLATFORM_ENTROPY
36+
37+
conf unset MBEDTLS_CIPHER_MODE_CFB
38+
conf unset MBEDTLS_CIPHER_MODE_CTR
39+
conf unset MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS
40+
conf unset MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN
41+
conf unset MBEDTLS_CIPHER_PADDING_ZEROS
42+
conf unset MBEDTLS_ECP_DP_SECP192R1_ENABLED
43+
conf unset MBEDTLS_ECP_DP_SECP224R1_ENABLED
44+
conf unset MBEDTLS_ECP_DP_SECP521R1_ENABLED
45+
conf unset MBEDTLS_ECP_DP_SECP192K1_ENABLED
46+
conf unset MBEDTLS_ECP_DP_SECP224K1_ENABLED
47+
conf unset MBEDTLS_ECP_DP_SECP256K1_ENABLED
48+
conf unset MBEDTLS_ECP_DP_BP256R1_ENABLED
49+
conf unset MBEDTLS_ECP_DP_BP384R1_ENABLED
50+
conf unset MBEDTLS_ECP_DP_BP512R1_ENABLED
51+
conf unset MBEDTLS_PK_PARSE_EC_EXTENDED
52+
53+
conf unset MBEDTLS_AESNI_C
54+
conf unset MBEDTLS_ARC4_C
55+
conf unset MBEDTLS_BLOWFISH_C
56+
conf unset MBEDTLS_CAMELLIA_C
57+
conf unset MBEDTLS_DES_C
58+
conf unset MBEDTLS_DHM_C
59+
conf unset MBEDTLS_GENPRIME
60+
conf unset MBEDTLS_MD5_C
61+
conf unset MBEDTLS_PADLOCK_C
62+
conf unset MBEDTLS_PEM_WRITE_C
63+
conf unset MBEDTLS_PKCS5_C
64+
conf unset MBEDTLS_PKCS12_C
65+
conf unset MBEDTLS_RIPEMD160_C
66+
conf unset MBEDTLS_SHA1_C
67+
conf unset MBEDTLS_XTEA_C
68+
69+
conf unset MBEDTLS_X509_RSASSA_PSS_SUPPORT
70+
71+
conf unset MBEDTLS_X509_CSR_PARSE_C
72+
conf unset MBEDTLS_X509_CREATE_C
73+
conf unset MBEDTLS_X509_CRT_WRITE_C
74+
conf unset MBEDTLS_X509_CSR_WRITE_C
75+
76+
conf unset MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
77+
conf unset MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
78+
conf unset MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
79+
conf unset MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
80+
conf unset MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
81+
conf unset MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
82+
conf unset MBEDTLS_SSL_FALLBACK_SCSV
83+
conf unset MBEDTLS_SSL_CBC_RECORD_SPLITTING
84+
conf unset MBEDTLS_SSL_PROTO_TLS1
85+
conf unset MBEDTLS_SSL_PROTO_TLS1_1
86+
conf unset MBEDTLS_SSL_TRUNCATED_HMAC
87+
88+
conf unset MBEDTLS_PLATFORM_TIME_TYPE_MACRO
89+

0 commit comments

Comments
 (0)