yuzu-mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-mirror/mbedtls.git synced 2025-12-06 07:12:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
17856 commits 89 branches 205 tags 114 MiB
Commit graph

7682 commits

Author SHA1 Message Date
Manuel Pégourié-Gonnard 4313d3ac87
Merge pull request #5010 from gilles-peskine-arm/psa-rsa-pss_any_salt 
PSA: fix salt length for PSS verification
 2021-10-29 16:36:36 +02:00
Brett Warren 14efd33a6c Convert TLS1.3 functions to get_supported_groups 
Signed-off-by: Brett Warren <brett.warren@arm.com>
 2021-10-29 15:13:48 +01:00
Brett Warren 01f3dae3f3 Refactor elliptic curve extension for NamedGroups 
The refactoring is needed for the group api to work
properly. Code is modified to use mbedtls_get_supported_groups
instead of direct access so that both deprecated and new api
are useable.

Signed-off-by: Brett Warren <brett.warren@arm.com>
 2021-10-29 14:07:46 +01:00
Jerry Yu 6f87f2521c Refactor ssl_tls13_parse_certificate_verify 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-29 20:15:03 +08:00
Jerry Yu d0fc585b7e fix various issues 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-29 19:57:55 +08:00
Jerry Yu 0b32c502a4 fix various issues 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-29 19:57:55 +08:00
Jerry Yu da8cdf2fa9 Remove certificate_verify_coordinate 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-29 19:57:55 +08:00
Jerry Yu 982d9e5db2 Add ssl_tls13_sig_alg_is_offered 
To keep consistent with cipher_suite check

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-29 19:57:55 +08:00
Jerry Yu 133690ccef Refactor hash computation 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-29 19:57:55 +08:00
Jerry Yu 26c2d11802 Fix various issues 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-29 19:57:55 +08:00
Jerry Yu 30b071cb66 tls13:Add certificate verify 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-29 19:57:55 +08:00
Jerry Yu 0bbb39786d tls13: add labels 
add client and server cv magic words

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-29 19:57:55 +08:00
Brett Warren e0edc8407b Add mbedtls_ssl_conf_groups to API 
mbedtls_ssl_conf_groups allows supported groups for key
sharing to be configured via their IANA NamedGroup ID.

This is added in anticipation of PQC and Hybrid key
sharing algorithms being integrated into Mbed TLS.

mbedtls_ssl_conf_curves is deprecated in favor of
mbedtls_ssl_conf_groups. handshake_init has been
modified to translate and copy curves configured
via conf_curves into a heap allocatied array of
NamedGroup IDs. This allows the refactoring of code
interacting with conf_curve related variables (such
as curve_list) to use NamedGroup IDs while retaining
the deprecated API.

Signed-off-by: Brett Warren <brett.warren@arm.com>
 2021-10-29 11:27:00 +01:00
Ronald Cron f660c7c923
Merge pull request #4993 from xffbai/add-tls13-read-certificate 
TLS1.3: add tls1_3 read certificate
 2021-10-29 12:25:44 +02:00
Manuel Pégourié-Gonnard 136819fe6e
Merge pull request #4959 from gilles-peskine-arm/psa-add-aria 
Add ARIA to the PSA API
 2021-10-29 09:38:06 +02:00
Xiaofei Bai f93cbd2674 fix some format issues 
Signed-off-by: Xiaofei Bai <xiaofei.bai@arm.com>
 2021-10-29 02:39:30 +00:00
Jerry Yu d2674314a3 Restore certificate_request state 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-29 10:14:29 +08:00
Jerry Yu b640bf6c15 fix CI build fail 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-29 10:05:32 +08:00
Jerry Yu 83bb13101a fix format warning 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-28 22:16:33 +08:00
Jerry Yu 7aa7186022 fix various issues 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-28 21:41:30 +08:00
Jerry Yu a93ac116c8 Remove certificate_request state 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-28 21:36:03 +08:00
Xiaofei Bai ff45602c74 Add local variable verify_result 
Signed-off-by: Xiaofei Bai <xiaofei.bai@arm.com>
 2021-10-28 21:28:08 +08:00
Xiaofei Bai 10aeec0685 Fix a build error 
Signed-off-by: Xiaofei Bai <xiaofei.bai@arm.com>
 2021-10-28 21:28:08 +08:00
Xiaofei Bai 79595acf3f Update based on review comments. 
Signed-off-by: Xiaofei Bai <xiaofei.bai@arm.com>
 2021-10-28 21:28:08 +08:00
Xiaofei Bai 947571efff add tls1_3 read certificate 
Signed-off-by: Xiaofei Bai <xiaofei.bai@arm.com>
 2021-10-28 21:28:08 +08:00
Ronald Cron 7cd24ded48
Merge pull request #5114 from yuhaoth/pr/add-get-uint24 
Add GET/PUT_UINT24_BE/LE
 2021-10-28 13:57:57 +02:00
Ronald Cron cf1f376b24
Merge pull request #4937 from xkqian/add_tls13_encrypted_extension 
The rebase after the two approvals was simple enough to need only one reviewer.
 2021-10-28 09:34:56 +02:00
Manuel Pégourié-Gonnard 4c9313fcd9
Merge pull request #4514 from mpg/generated-files-cmake 
Generated files cmake
 2021-10-28 09:23:41 +02:00
Jerry Yu 29287a46d2 fix wrong para name in doxygen comments 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-28 10:26:13 +08:00
XiaokangQian ab7f50d638 Change macro names and add test script for extensions 
Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
 2021-10-28 01:54:39 +00:00
XiaokangQian 7b2d4efee8 Change the buffer boundary check and alert type 
Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
 2021-10-28 01:49:37 +00:00
XiaokangQian 8db25fffb4 Encrypted Extensions: Change extensions length check 
Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
 2021-10-28 01:49:37 +00:00
XiaokangQian 97799ac27b Encrypted Extensions: Align code style and some check logic 
Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
 2021-10-28 01:49:37 +00:00
XiaokangQian 08da26c58f Refine encrypted extensions parse function 
Change arguments of API.
Send different messages base on extensions types.

Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
 2021-10-28 01:49:37 +00:00
XiaokangQian 140f0459ed Encrypted Extension: Align the code style of buffer pointer 
Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
 2021-10-28 01:49:37 +00:00
XiaokangQian e87e5924c9 Fix some issues such as naming mismatch based on comments. 
Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
 2021-10-28 01:49:37 +00:00
XiaokangQian c1fe000cfd TLS1.3: Solve check name issue-macro definition 
Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
 2021-10-28 01:49:37 +00:00
XiaokangQian 2d5c72be0b TLS1.3: Add Encrypted Extensions 
Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
 2021-10-28 01:49:37 +00:00
Ronald Cron 5893246066
Merge pull request #4919 from yuhaoth/pr/add-tls13-server-hello-parser 
TLS1.3:ServerHello:Add parse server hello function
 2021-10-27 18:27:27 +02:00
Jerry Yu f3f5c210cb fix comments issue 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-27 17:05:49 +08:00
Mateusz Starzyk 4cb9739038 Use separate MBEDTLS_MODE for the CCM*. 
Signed-off-by: Mateusz Starzyk <mateusz.starzyk@mobica.com>
 2021-10-27 10:42:31 +02:00
Jerry Yu 643d11606a Add GET/PUT_UINT24_BE/LE 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-27 13:55:37 +08:00
Jerry Yu e6d7e5cef6 move CLIENT/SERVER_HELLO_RANDOM_LEN to ssl_misc.h 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-26 11:10:15 +08:00
Gilles Peskine ac253ea32b Fix copypasta in comment 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2021-10-25 22:15:20 +02:00
Gilles Peskine c1776a01d2 Move declarations of testing-only base64 functions to their own header 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2021-10-25 22:15:13 +02:00
Gilles Peskine d7d3279fdf Expose internal base64 functions for testing 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2021-10-25 22:09:12 +02:00
Gilles Peskine 8635e2301f mask_of_range: simplify high comparison 
To test c <= high, instead of testing the sign of (high + 1) - c, negate the
sign of high - c (as we're doing for c - low). This is a little easier to
read and shaves 2 instructions off the arm thumb build with
arm-none-eabi-gcc 7.3.1.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2021-10-25 22:09:12 +02:00
Gilles Peskine 67468e81a6 Base64 decode: simplify local variables (n) 
n was used for two different purposes. Give it a different name the second
time. This does not seem to change the generated code when compiling with
optimization for size or performance.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2021-10-25 22:09:12 +02:00
Gilles Peskine 2c4a3686bb Base64 encoding: use ranges instead of tables 
Instead of doing constant-flow table lookup, which requires 64 memory loads
for each lookup into a 64-entry table, do a range-based calculation, which
requires more CPU instructions per range but there are only 5 ranges.

I expect a significant performance gain (although smaller than for decoding
since the encoding table is half the size), but I haven't measured. Code
size is slightly smaller.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2021-10-25 22:09:12 +02:00
Gilles Peskine 1121cd29b6 Base64 decode: simplify local variables 
Document what each local variable does when it isn't obvious from the name.
Don't reuse a variable for different purposes.

This commit has very little impact on the generated code (same code size on
a sample Thumb build), although it does fix a theoretical bug that 2^32
spaces inside a line would be ignored instead of treated as an error.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2021-10-25 22:09:12 +02:00
Gilles Peskine ab04335052 Base64 decoding: use ranges instead of tables 
Instead of doing constant-flow table lookup, which requires 128 memory loads
for each lookup into a 128-entry table, do a range-based calculation, which
requires more CPU instructions per range but there are only 5 ranges.

Experimentally, this is ~12x faster on my PC (based on
programs/x509/load_roots). The code is slightly smaller, too.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2021-10-25 22:09:12 +02:00
Gilles Peskine b553eaabea Base64 decoding: don't use the table for '=' 
Base64 decoding uses equality comparison tests for characters that don't
leak information about the content of the data other than its length, such
as whitespace. Do this with '=' as well, since it only reveals information
about the length. This way the table lookup can focus on character validity
and decoding value.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2021-10-25 22:09:12 +02:00
Gilles Peskine 4fa0725936
Merge pull request #5002 from mstarzyk-mobica/psa_output_buffer_limitation 
Remove output buffer limitation for PSA with GCM.
 2021-10-25 19:37:33 +02:00
David Horstmann a8d1406107 Rename DEV_MODE to GEN_FILES 
GEN_FILES is a bit clearer as it describes what the setting
does more precisely.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2021-10-25 13:16:04 +01:00
Manuel Pégourié-Gonnard e90e405e15 Introduce "Dev mode" option 
When the option is On, CMake will have rules to generate the generated
files using scripts etc. When the option is Off, CMake will assume the
files are available from the source tree; in that mode, it won't require
any extra tools (Perl for example) compared to when we committed the
files to git.

The intention is that users will never need to adjust this option:

- in the development branch (and features branches etc.) the option is
always On (development mode);
- in released tarballs, which include the generated files, we'll switch
the option to Off (release mode) in the same commit that re-adds the
generated files.

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
 2021-10-25 13:16:04 +01:00
Manuel Pégourié-Gonnard 65a7203119 Allow cmake to generate version_features.c 
Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
 2021-10-25 13:16:03 +01:00
Manuel Pégourié-Gonnard cbdedc54b9 Allow cmake to generate error.c 
Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
 2021-10-25 13:16:03 +01:00
Jerry Yu 188468b5f4 Add reference link for Random definition 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:48:24 +08:00
Jerry Yu ad3a113fc6 Remove MBEDTLS_SSL_EXPORT_KEYS 
It is always on now in `development`

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:46:43 +08:00
Jerry Yu 7a186a0cbf fix comment issue 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:29 +08:00
Jerry Yu 337d5318ae replace md_max_size with tls13_md_max_size 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:29 +08:00
Jerry Yu 745bb616a4 Fix format issue and enhance test 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:29 +08:00
Jerry Yu 193f0e7449 fix build fail on tls1_3_md_max_size 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:29 +08:00
Jerry Yu b85277e3af Address various issues 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:29 +08:00
Jerry Yu 435208a949 Improve generate_handshake_keys 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:29 +08:00
Jerry Yu f532bb2577 Change MD size for tls13 keys 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:29 +08:00
Jerry Yu c068b6671e Rename tls13 prefix to fix coding issues 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:28 +08:00
Jerry Yu 4a1733831e fix various issues 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:28 +08:00
Jerry Yu f0ac2352d6 Refactor key_schedule_stage_handshake 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:28 +08:00
Jerry Yu 5ccfcd4ca1 Add local variable to represent handshake 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:28 +08:00
Jerry Yu de4fb2cc34 Apply check read ptr macro 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:28 +08:00
Jerry Yu fd532e506b fix set key exchange mode issue 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:28 +08:00
Jerry Yu 0b17784932 Add finalize function 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:28 +08:00
Jerry Yu e1b9c297b9 Add read_server_hello 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:28 +08:00
Jerry Yu 1efa815db7 tls13: add ecdh_read_public 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:28 +08:00
Jerry Yu a0650ebb9d tls13: add handshake key schedule 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:28 +08:00
Jerry Yu 61e35e0047 tls13: add generate handshake keys 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-25 10:41:28 +08:00
Mateusz Starzyk 594215be6e Add support for CCM*-no-tag to PSA. 
Signed-off-by: Mateusz Starzyk <mateusz.starzyk@mobica.com>
 2021-10-21 11:33:41 +02:00
Mateusz Starzyk bb2ced33dd Ignore plaintext length for CCM*-no-tag. 
Signed-off-by: Mateusz Starzyk <mateusz.starzyk@mobica.com>
 2021-10-21 11:33:37 +02:00
Gilles Peskine 9202ba37b1
Merge pull request #4960 from mpg/cleanup-tls-cipher-psa-3.x 
Clean up some remnants of TLS pre-1.2 support
 2021-10-19 21:59:15 +02:00
Gilles Peskine 6210320215
Merge pull request #4989 from AndrzejKurek/remove-ssl-export-keys 
Remove MBEDTLS_SSL_EXPORT_KEYS, making it always on
 2021-10-18 17:53:56 +02:00
Gilles Peskine bf21c07923
Merge pull request #5072 from mprse/issue_5065 
Use switch statement instead if-else in psa_aead_check_nonce_length() and psa_aead_set_lengths(). Fixes #5065
 2021-10-18 17:51:50 +02:00
Gilles Peskine 7637ab0d8b
Merge pull request #5037 from mprse/issue_4551 
Fix psa_generate_key(): return PSA_ERROR_INVALID_ARGUMENT for public key
 2021-10-18 10:39:21 +02:00
Gilles Peskine 2bb5e9c973
Merge pull request #4760 from gilles-peskine-arm/ecb-alt-ret-3.0 
Catch failures of mbedtls_aes_crypt_ecb and its DES equivalents
 2021-10-14 12:11:20 +02:00
Przemyslaw Stekiel 4cad4fc8a9 psa_crypto.c: use switch instead if-else in psa_aead_check_nonce_length and psa_aead_set_lengths (fixes #5065) 
Signed-off-by: Przemyslaw Stekiel <przemyslaw.stekiel@mobica.com>
 2021-10-13 14:04:36 +02:00
Ronald Cron e3e16d5d67
Merge pull request #4982 from yuhaoth/pr/add-read-ptr-and-handshake-kex-modes 
TLS1.3:add read ptr and handshake kex modes
CI merge job: only "Session resume using tickets, DTLS: openssl client" failed in one component thus CI can be considered as passed.
 2021-10-11 19:23:12 +02:00
Ronald Cron e23bba04ee
Merge pull request #4927 from yuhaoth/pr/add-tls13-serverhello-utils 
TLS 1.3: ServerHello: add  utils functions used by ServerHello
Regarding the merge job, there was only one of the failure we currently encounter on almost all PR (Session resume using tickets, DTLS: openssl client test case see #5012) thus we can consider that this PR passed CI.
 2021-10-11 11:01:11 +02:00
Jerry Yu e4eefc716a Improve document for chk_buf_read_ptr 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-09 10:40:40 +08:00
Gilles Peskine f6892dec2a Readability improvements 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2021-10-08 16:28:32 +02:00
Jerry Yu fd320e9a6e Replace zeroize with memset 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-08 21:52:41 +08:00
Jerry Yu 88b756bacb move tls1_3 max md size 
It should be internal definition

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-08 18:41:38 +08:00
Jerry Yu d1ab262844 define max md size for tls1_3 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-08 16:19:24 +08:00
Jerry Yu 205fd82f7e fix check_name fail 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-08 16:16:24 +08:00
Jerry Yu ae0b2e2a2f Rename counter_len 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-08 15:40:14 +08:00
Jerry Yu c1ddeef53a fix various issues 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-08 15:40:14 +08:00
Jerry Yu dca3d5ddf9 fix document issues 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-08 14:19:29 +08:00
Jerry Yu 0cabad375b fix doxygen parameter wrong 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-08 14:00:29 +08:00
Jerry Yu adf861aad4 Address kex_modes check function 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-08 14:00:29 +08:00
Jerry Yu e15e665cfb fix comments and check return issues 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-08 14:00:29 +08:00
Jerry Yu 1b7c4a464c tls13: add key exchange modes in handshake params 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2021-10-08 14:00:29 +08:00