Skip to content

Commit df3e7ae

Browse files
bors[bot]raoulstrackxVardhan Thigle
authored
Merge #156
156: Update to mbedtls 2.26.0 r=zugzwang a=raoulstrackx Co-authored-by: Raoul Strackx <[email protected]> Co-authored-by: Vardhan Thigle <[email protected]>
2 parents 9f17a9c + c9326ae commit df3e7ae

File tree

206 files changed

+16534
-8410
lines changed

Some content is hidden

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

206 files changed

+16534
-8410
lines changed

‎Cargo.lock

+274-274
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mbedtls-sys/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "mbedtls-sys-auto"
3-
version = "2.25.2"
3+
version = "2.26.0"
44
authors = ["Jethro Beekman <[email protected]>"]
55
build = "build/build.rs"
66
license = "Apache-2.0/GPL-2.0+"

‎mbedtls-sys/build/config.rs

+5
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ const DEFAULT_DEFINES: &'static [CDefine] = &[
132132
("MBEDTLS_ECDSA_SIGN_ALT", Undefined),
133133
("MBEDTLS_ECDSA_GENKEY_ALT", Undefined),
134134
("MBEDTLS_ECP_INTERNAL_ALT", Undefined),
135+
("MBEDTLS_ECP_NO_FALLBACK", Undefined),
135136
("MBEDTLS_ECP_RANDOMIZE_JAC_ALT", Undefined),
136137
("MBEDTLS_ECP_ADD_MIXED_ALT", Undefined),
137138
("MBEDTLS_ECP_DOUBLE_JAC_ALT", Undefined),
@@ -202,7 +203,9 @@ const DEFAULT_DEFINES: &'static [CDefine] = &[
202203
("MBEDTLS_PK_RSA_ALT_SUPPORT", Defined),
203204
("MBEDTLS_PKCS1_V15", Defined),
204205
("MBEDTLS_PKCS1_V21", Defined),
206+
("MBEDTLS_PSA_CRYPTO_CLIENT", Undefined),
205207
("MBEDTLS_PSA_CRYPTO_DRIVERS", Undefined),
208+
("MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG", Undefined),
206209
("MBEDTLS_PSA_CRYPTO_SPM", Undefined),
207210
("MBEDTLS_PSA_INJECT_ENTROPY", Undefined),
208211
("MBEDTLS_RSA_NO_CRT", Undefined),
@@ -374,6 +377,8 @@ const DEFAULT_DEFINES: &'static [CDefine] = &[
374377
("MBEDTLS_PLATFORM_VSNPRINTF_MACRO", Undefined), // default: vsnprintf
375378
("MBEDTLS_PLATFORM_NV_SEED_READ_MACRO", Undefined), // default: mbedtls_platform_std_nv_seed_read
376379
("MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO", Undefined), // default: mbedtls_platform_std_nv_seed_write
380+
("MBEDTLS_PSA_HMAC_DRBG_MD_TYPE", Undefined), // default: see config.h
381+
("MBEDTLS_PSA_KEY_SLOT_COUNT", Undefined), // default: 32
377382
("MBEDTLS_SSL_CACHE_DEFAULT_TIMEOUT", Undefined), // default: 86400
378383
("MBEDTLS_SSL_CACHE_DEFAULT_MAX_ENTRIES", Undefined), // default: 50
379384
("MBEDTLS_SSL_MAX_CONTENT_LEN", Undefined), // default: 16384

‎mbedtls-sys/build/headers.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,21 @@ pub const ORDERED: &'static [(Option<&'static str>, &'static str)] = &[
4141
(None, "x509.h"),
4242
(None, "cipher.h"),
4343
(None, "x509_crl.h"),
44+
(None, "aes.h"),
4445
(None, "ssl_ciphersuites.h"),
4546
(None, "x509_crt.h"),
4647
(None, "dhm.h"),
4748
(None, "ecdh.h"),
4849
(None, "oid.h"),
50+
(None, "ctr_drbg.h"),
51+
(None, "hmac_drbg.h"),
4952
(None, "ssl.h"),
5053
(None, "md5.h"),
5154
(None, "sha1.h"),
5255
(None, "sha256.h"),
5356
(None, "sha512.h"),
5457
(None, "ecjpake.h"),
5558
(None, "psa_util.h"),
56-
(None, "aes.h"),
5759
(None, "net_sockets.h"),
5860
(None, "havege.h"),
5961
(None, "poly1305.h"),
@@ -81,7 +83,6 @@ pub const ORDERED: &'static [(Option<&'static str>, &'static str)] = &[
8183
(None, "md_internal.h"),
8284
(None, "md4.h"),
8385
(None, "md2.h"),
84-
(None, "hmac_drbg.h"),
8586
(None, "hkdf.h"),
8687
(None, "gcm.h"),
8788
(None, "error.h"),
@@ -90,7 +91,6 @@ pub const ORDERED: &'static [(Option<&'static str>, &'static str)] = &[
9091
(None, "ecp_internal.h"),
9192
(None, "des.h"),
9293
(None, "debug.h"),
93-
(None, "ctr_drbg.h"),
9494
(None, "cmac.h"),
9595
(None, "cipher_internal.h"),
9696
(None, "chachapoly.h"),

‎mbedtls-sys/vendor/.github/issue_template.md

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
Note: This is just a template, so feel free to use/remove the unnecessary things
2+
3+
### Description
4+
- Type: Bug | Enhancement\Feature Request
5+
- Priority: Blocker | Major | Minor
6+
7+
---------------------------------------------------------------
8+
## Bug
9+
10+
**OS**
11+
Mbed OS|linux|windows|
12+
13+
**mbed TLS build:**
14+
Version: x.x.x or git commit id
15+
OS version: x.x.x
16+
Configuration: please attach config.h file where possible
17+
Compiler and options (if you used a pre-built binary, please indicate how you obtained it):
18+
Additional environment information:
19+
20+
**Peer device TLS stack and version**
21+
OpenSSL|GnuTls|Chrome|NSS(Firefox)|SecureChannel (IIS/Internet Explorer/Edge)|Other
22+
Version:
23+
24+
**Expected behavior**
25+
26+
**Actual behavior**
27+
28+
**Steps to reproduce**
29+
30+
----------------------------------------------------------------
31+
## Enhancement\Feature Request
32+
33+
**Justification - why does the library need this feature?**
34+
35+
**Suggested enhancement**
36+
37+
-----------------------------------------------------------------
38+
39+
## Question
40+
41+
**Please first check for answers in the [Mbed TLS knowledge Base](https://tls.mbed.org/kb). If you can't find the answer you're looking for then please use the [Mbed TLS mailing list](https://lists.trustedfirmware.org/mailman/listinfo/mbed-tls)**

‎mbedtls-sys/vendor/.github/pull_request_template.md

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
Notes:
2+
* Pull requests cannot be accepted until the PR follows the [contributing guidelines](../CONTRIBUTING.md). In particular, each commit must have at least one `Signed-off-by:` line from the committer to certify that the contribution is made under the terms of the [Developer Certificate of Origin](../dco.txt).
3+
* This is just a template, so feel free to use/remove the unnecessary things
4+
## Description
5+
A few sentences describing the overall goals of the pull request's commits.
6+
7+
8+
## Status
9+
**READY/IN DEVELOPMENT/HOLD**
10+
11+
## Requires Backporting
12+
When there is a bug fix, it should be backported to all maintained and supported branches.
13+
Changes do not have to be backported if:
14+
- This PR is a new feature\enhancement
15+
- This PR contains changes in the API. If this is true, and there is a need for the fix to be backported, the fix should be handled differently in the legacy branch
16+
17+
Yes | NO
18+
Which branch?
19+
20+
## Migrations
21+
If there is any API change, what's the incentive and logic for it.
22+
23+
YES | NO
24+
25+
## Additional comments
26+
Any additional information that could be of interest
27+
28+
## Todos
29+
- [ ] Tests
30+
- [ ] Documentation
31+
- [ ] Changelog updated
32+
- [ ] Backported
33+
34+
35+
## Steps to test or reproduce
36+
Outline the steps to test or reproduce the PR here.

‎mbedtls-sys/vendor/.gitignore

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# Random seed file created by test scripts and sample programs
2+
seedfile
3+
4+
# CMake build artifacts:
5+
CMakeCache.txt
6+
CMakeFiles
7+
CTestTestfile.cmake
8+
cmake_install.cmake
9+
Testing
10+
# CMake generates *.dir/ folders for in-tree builds (used by MSVC projects), ignore all of those:
11+
*.dir/
12+
# MSVC files generated by CMake:
13+
/*.sln
14+
/*.vcxproj
15+
/*.filters
16+
17+
# Test coverage build artifacts:
18+
Coverage
19+
*.gcno
20+
*.gcda
21+
22+
# generated by scripts/memory.sh
23+
massif-*
24+
25+
# MSVC build artifacts:
26+
*.exe
27+
*.pdb
28+
*.ilk
29+
*.lib
30+
31+
# Python build artifacts:
32+
*.pyc
33+
34+
# CMake generates *.dir/ folders for in-tree builds (used by MSVC projects), ignore all of those:
35+
*.dir/
36+
37+
# Microsoft CMake extension for Visual Studio Code generates a build directory by default
38+
/build/
39+
40+
# Visual Studio artifacts
41+
/visualc/VS2010/.localhistory/
42+
/visualc/VS2010/.vs/
43+
/visualc/VS2010/Debug/
44+
/visualc/VS2010/Release/
45+
/visualc/VS2010/*.vcxproj.filters
46+
/visualc/VS2010/*.vcxproj.user
47+
48+
# Generated documentation:
49+
/apidoc
50+
51+
# Editor navigation files:
52+
/GPATH
53+
/GRTAGS
54+
/GSYMS
55+
/GTAGS
56+
/TAGS
57+
/cscope*.out
58+
/tags

‎mbedtls-sys/vendor/.globalrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
default:\
2+
:langmap=c\:.c.h.function:\
3+

‎mbedtls-sys/vendor/.mypy.ini

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[mypy]
2+
mypy_path = scripts
3+
namespace_packages = True
4+
warn_unused_configs = True

‎mbedtls-sys/vendor/.pylintrc

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
[MASTER]
2+
init-hook='import sys; sys.path.append("scripts")'
3+
4+
[BASIC]
5+
# We're ok with short funtion argument names.
6+
# [invalid-name]
7+
argument-rgx=[a-z_][a-z0-9_]*$
8+
9+
# Allow filter and map.
10+
# [bad-builtin]
11+
bad-functions=input
12+
13+
# We prefer docstrings, but we don't require them on all functions.
14+
# Require them only on long functions (for some value of long).
15+
# [missing-docstring]
16+
docstring-min-length=10
17+
18+
# No upper limit on method names. Pylint <2.1.0 has an upper limit of 30.
19+
# [invalid-name]
20+
method-rgx=[a-z_][a-z0-9_]{2,}$
21+
22+
# Allow module names containing a dash (but no underscore or uppercase letter).
23+
# They are whole programs, not meant to be included by another module.
24+
# [invalid-name]
25+
module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+)|[a-z][-0-9a-z]+)$
26+
27+
# Some functions don't need docstrings.
28+
# [missing-docstring]
29+
no-docstring-rgx=(run_)?main$
30+
31+
# We're ok with short local or global variable names.
32+
# [invalid-name]
33+
variable-rgx=[a-z_][a-z0-9_]*$
34+
35+
[DESIGN]
36+
# Allow more than the default 7 attributes.
37+
# [too-many-instance-attributes]
38+
max-attributes=15
39+
40+
[FORMAT]
41+
# Allow longer modules than the default recommended maximum.
42+
# [too-many-lines]
43+
max-module-lines=2000
44+
45+
[MESSAGES CONTROL]
46+
# * locally-disabled, locally-enabled: If we disable or enable a message
47+
# locally, it's by design. There's no need to clutter the Pylint output
48+
# with this information.
49+
# * logging-format-interpolation: Pylint warns about things like
50+
# ``log.info('...'.format(...))``. It insists on ``log.info('...', ...)``.
51+
# This is of minor utility (mainly a performance gain when there are
52+
# many messages that use formatting and are below the log level).
53+
# Some versions of Pylint (including 1.8, which is the version on
54+
# Ubuntu 18.04) only recognize old-style format strings using '%',
55+
# and complain about something like ``log.info('{}', foo)`` with
56+
# logging-too-many-args (Pylint supports new-style formatting if
57+
# declared globally with logging_format_style under [LOGGING] but
58+
# this requires Pylint >=2.2).
59+
# * no-else-return: Allow the perfectly reasonable idiom
60+
# if condition1:
61+
# return value1
62+
# else:
63+
# return value2
64+
# * unnecessary-pass: If we take the trouble of adding a line with "pass",
65+
# it's because we think the code is clearer that way.
66+
disable=locally-disabled,locally-enabled,logging-format-interpolation,no-else-return,unnecessary-pass
67+
68+
[REPORTS]
69+
# Don't diplay statistics. Just the facts.
70+
reports=no
71+
72+
[VARIABLES]
73+
# Allow unused variables if their name starts with an underscore.
74+
# [unused-argument]
75+
dummy-variables-rgx=_.*

‎mbedtls-sys/vendor/.travis.yml

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
language: c
2+
compiler: gcc
3+
sudo: false
4+
cache: ccache
5+
6+
jobs:
7+
include:
8+
- name: basic checks and reference configurations
9+
addons:
10+
apt:
11+
packages:
12+
- gnutls-bin
13+
- doxygen
14+
- graphviz
15+
- gcc-arm-none-eabi
16+
- libnewlib-arm-none-eabi
17+
language: python # Needed to get pip for Python 3
18+
python: 3.5 # version from Ubuntu 16.04
19+
install:
20+
- pip install mypy==0.780 pylint==2.4.4
21+
script:
22+
- tests/scripts/all.sh -k 'check_*'
23+
- tests/scripts/all.sh -k test_default_out_of_box
24+
- tests/scripts/test-ref-configs.pl
25+
- tests/scripts/all.sh -k build_arm_none_eabi_gcc_arm5vte build_arm_none_eabi_gcc_m0plus
26+
27+
- name: full configuration
28+
script:
29+
- tests/scripts/all.sh -k test_full_cmake_gcc_asan
30+
31+
- name: macOS
32+
os: osx
33+
compiler: clang
34+
script:
35+
- tests/scripts/all.sh -k test_default_out_of_box
36+
37+
- name: Windows
38+
os: windows
39+
before_install:
40+
- choco install python --version=3.5.4
41+
env:
42+
# Add the directory where the Choco package goes
43+
- PATH=/c/Python35:/c/Python35/Scripts:$PATH
44+
script:
45+
- type python; python --version
46+
- python scripts/generate_psa_constants.py
47+
# Logs appear out of sequence on Windows. Give time to catch up.
48+
- sleep 5
49+
- scripts/windows_msbuild.bat v141 # Visual Studio 2017
50+
51+
after_failure:
52+
- tests/scripts/travis-log-failure.sh
53+
54+
env:
55+
global:
56+
- SEED=1
57+
- secure: "FrI5d2s+ckckC17T66c8jm2jV6i2DkBPU5nyWzwbedjmEBeocREfQLd/x8yKpPzLDz7ghOvr+/GQvsPPn0dVkGlNzm3Q+hGHc/ujnASuUtGrcuMM+0ALnJ3k4rFr9xEvjJeWb4SmhJO5UCAZYvTItW4k7+bj9L+R6lt3TzQbXzg="
58+
59+
addons:
60+
apt:
61+
packages:
62+
- gnutls-bin
63+
coverity_scan:
64+
project:
65+
name: "ARMmbed/mbedtls"
66+
notification_email: [email protected]
67+
build_command_prepend:
68+
build_command: make
69+
branch_pattern: coverity_scan

0 commit comments

Comments
 (0)