ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-07-27 05:28:45 +08:00
Code Issues Releases Wiki Activity
17,833 Commits 174 Branches 272 Tags
Commit Graph

17833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Jones
ef180af350 Move MBEDTLS_ERR_ADD macro and functions to error.* 
`error.c` and  error.h are the more logical place to keep this code and it
prevents issues with building `common.c` and conflicts with other projects
that use mbedtls (such as mbedOS).

`error.c` has been automatically generated by first adding the code to
`error.fmt` and then running `./scripts/generate_errors.pl`.

Also add parenthesis to the addition in `MBEDTLS_ERR_ADD`.

Signed-off-by: Chris Jones <christopher.jones@arm.com>
 2021-04-13 15:21:43 +01:00
Chris Jones
808b7c8a8a Fix building with MBEDTLS_TEST_HOOKS enabled 
Fix building by adding `common.c` to the build scripts (both make and Cmake).

Also reworks the hook function pointer (also renamed to `err_add_hook`) to be
a static local to `common.c` with a setter function to set the pointer to a
checking function.

Signed-off-by: Chris Jones <christopher.jones@arm.com>
 2021-04-13 15:21:43 +01:00
Chris Jones
5e8805afeb Move MBEDTLS_ERR_ADD macro and function to common.* 
`error.c` is a file generated from `error.h` and thus cannot contain the code
that was previously added. This commit fixes that issue by moving the
`MBEDTLS_ERR_ADD` macro and associated function and function pointer into
`common.h` and `common.c`.

Also fix a typo in `tests/include/test/helpers.h` where tabs were accidentally
used instead of spaces.

Signed-off-by: Chris Jones <christopher.jones@arm.com>
 2021-04-13 15:21:43 +01:00
Chris Jones
713e4e77b4 Expand use of MBEDTLS_ERR_ADD to the rest of rsa.c 
All occurences of manual error code addition/combination, in `rsa.c`, have
been replaced with the `MBEDTLS_ERR_ADD` macro.

Signed-off-by: Chris Jones <christopher.jones@arm.com>
 2021-04-13 15:21:35 +01:00
Chris Jones
220cdece40 Fix error code combination check 
`mbedtls_test_err_add_check` was previously incorrectly throwing an error if
both error codes were correct and valid pure error codes. This change fixes
that behaviour to correctly throw errors when invalid combinations are found.

Signed-off-by: Chris Jones <christopher.jones@arm.com>
 2021-04-13 15:12:10 +01:00
Chris Jones
96ae73b0ea Add macro for error code addition 
Adds a macro (`MBEDTLS_ERR_ADD`) to add error codes together and check that the
result will not be corrupted. This additional check is only enabled during
testing when `MBEDTLS_TEST_HOOKS` is defined.

Also includes a reference usage example in `rsa.c` where two high-level error
codes could be incorrectly added together under the right conditions. This now
ensures that when this error occurs during testing it will be correctly
reported.

Signed-off-by: Chris Jones <christopher.jones@arm.com>
 2021-04-13 15:12:02 +01:00
TRodziewicz
e148b6884c error.c re-generated. 
Signed-off-by: TRodziewicz <tomasz.rodziewicz@mobica.com>
 2021-04-13 15:00:30 +02:00
TRodziewicz
b579ccd529 The still used deprecated error codes replaced with _PLATFORM_ ones 
Signed-off-by: TRodziewicz <tomasz.rodziewicz@mobica.com>
 2021-04-13 14:29:29 +02:00
Manuel Pégourié-Gonnard
528b0a6b18
Merge pull request #4323 from gilles-peskine-arm/ecp-add-fix-changelog-development 
Changelog entry for mbedtls_mpi_read_string("-0")
 2021-04-13 09:57:10 +02:00
TRodziewicz
bca65e4ffd Merge branch 'remove_depr_error_codes' of https://github.com/TRodziewicz/mbedtls into remove_depr_error_codes 
Signed-off-by: TRodziewicz <tomasz.rodziewicz@mobica.com>
 2021-04-12 23:44:36 +02:00
TRodziewicz
d11ddc54b6 Correction in the TODO issue number 
Signed-off-by: TRodziewicz <tomasz.rodziewicz@mobica.com>
 2021-04-12 23:41:46 +02:00
Tomasz Rodziewicz
c258a0fa65
Update md.h 2021-04-12 23:39:44 +02:00
TRodziewicz
dd82502b56 Remove deprecated error codes. Some still remain - question asked in issue comment 
Signed-off-by: TRodziewicz <tomasz.rodziewicz@mobica.com>
 2021-04-12 23:28:23 +02:00
TRodziewicz
0961e3db49 Changelog added 
Signed-off-by: TRodziewicz <tomasz.rodziewicz@mobica.com>
 2021-04-12 17:19:43 +02:00
TRodziewicz
9a86843470 fix error.c - second try 
Signed-off-by: TRodziewicz <tomasz.rodziewicz@mobica.com>
 2021-04-12 15:13:10 +02:00
TRodziewicz
48f6d0d6e5 fix error.c - now it's autogenerated 
Signed-off-by: TRodziewicz <tomasz.rodziewicz@mobica.com>
 2021-04-12 14:49:55 +02:00
TRodziewicz
c75d9f589b Remove deprecated things from hashing modules 
Signed-off-by: TRodziewicz <tomasz.rodziewicz@mobica.com>
 2021-04-12 11:38:37 +02:00
Gilles Peskine
8f28c24b4a Explain the problem in more concrete terms 
Don't try to make the reader guess what a “negative zero” might mean.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2021-04-09 20:20:26 +02:00
Gilles Peskine
fd4fab0b24 mbedtls_mpi_read_string("-0") no longer produces a "negative zero" 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2021-04-09 17:13:15 +02:00
Chris Jones
9c6356881f Remove MBEDTLS_SSL_DEFAULT_TICKET_LIFETIME 
This config option has been unused for >5 years and so should be removed.

Signed-off-by: Chris Jones <christopher.jones@arm.com>
 2021-04-09 16:10:48 +01:00
Gilles Peskine
9a1c092f8b
Merge pull request #4297 from gilles-peskine-arm/ecp-add-fix-202104 
Fix ECP arithmetic bug and read of zero-padded negative number
 2021-04-09 16:46:06 +02:00
Gilles Peskine
392d1010dc Clarify some comments 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2021-04-09 15:46:51 +02:00
Gilles Peskine
bd43f67a9b Fix copypasta in test case description 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2021-04-09 15:46:40 +02:00
Manuel Pégourié-Gonnard
e991aa48c5
Merge pull request #4311 from gilles-peskine-arm/move-internal-headers-doxygen 
[3.0] Remove obsolete reference to internal headers under include/
 2021-04-09 14:40:19 +02:00
Gilles Peskine
f04c0ed2a7
Merge pull request #4318 from bensze01/ecc_get_family_doc 
Fix reference to deprecated macro in documentation
 2021-04-08 17:58:42 +02:00
Dave Rodgman
2fdd5afc29
Merge pull request #4305 from daverodgman/development_new 
Merge development onto development_3.0
 2021-04-08 15:45:35 +01:00
Bence Szépkúti
3b1cba82c8 Fix reference to deprecated macro in documentation 
The reference was introduced in #4174.

Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>
 2021-04-08 16:10:05 +02:00
Ronald Cron
df2e4f22a8
Merge pull request #4290 from ronald-cron-arm/hash-dispatch-follow-up 
Hash dispatch follow up
 2021-04-08 09:13:19 +02:00
TRodziewicz
05942058e7 Remove debug statement 
Signed-off-by: TRodziewicz <tomasz.rodziewicz@mobica.com>
 2021-04-07 19:24:04 +02:00
TRodziewicz
611f043736 Correct the new tests names 
Signed-off-by: TRodziewicz <tomasz.rodziewicz@mobica.com>
 2021-04-07 19:19:47 +02:00
TRodziewicz
40de3c99c0 Fix Changelog, add separate test functions for hash of all-zero bits 
Signed-off-by: TRodziewicz <tomasz.rodziewicz@mobica.com>
 2021-04-07 19:16:18 +02:00
Dave Rodgman
bd069163be Fix line lengths in changelog 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
 2021-04-07 16:38:31 +01:00
Dave Rodgman
3b5e6f0b30 Fix some errors relating to header file renames 
Fix some errors due to renaming of header files in the 3.0 branch.

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
 2021-04-07 16:36:53 +01:00
Dave Rodgman
73e3e2cb1a Merge remote-tracking branch 'origin/development' into development_new 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

Conflicts:
        include/mbedtls/check_config.h: nearby edits
	library/entropy.c: nearby edits
	programs/random/gen_random_havege.c: modification vs. removal
	programs/ssl/ssl_test_lib.h: nearby edits
	programs/test/cpp_dummy_build.cpp: nearby edits
	visualc/VS2010/mbedTLS.vcxproj: automatically generated file,
            regenerated with scripts/generate_visualc_files.pl
 2021-04-07 16:31:09 +01:00
Dave Rodgman
6741fc9148
Merge pull request #4306 from daverodgman/fix_mps_trace_macros 
Capitalise MPS trace macros
 2021-04-07 16:07:50 +01:00
Dave Rodgman
38ff9adacb
Merge pull request #4308 from daverodgman/checknames-grep 
Forwardport 3.0: Make check-names.sh accept FreeBSD grep
 2021-04-07 15:28:08 +01:00
Dave Rodgman
0708974d85
Merge pull request #4309 from daverodgman/check-names-grep-backport 
Make check-names.sh accept any grep
 2021-04-07 15:27:44 +01:00
Gilles Peskine
0ff0ff776a Remove obsolete reference to internal headers under include/ 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
 2021-04-07 16:16:37 +02:00
Ronald Cron
810eb16831 psa: aead: Make CCM/GCM ordering consistent 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
 2021-04-07 16:03:31 +02:00
Ronald Cron
a1971c3b72 tests: psa: aead: Fix forced error code 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
 2021-04-07 16:03:31 +02:00
Ronald Cron
b9349a67a9 psa: aead: Add missing chachapoly context free 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
 2021-04-07 16:03:31 +02:00
Ronald Cron
ecbc068252 psa: aead: Remove from operation ctx members only used in setup 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
 2021-04-07 16:03:31 +02:00
Steven Cooreman
ea7ab13991 Do validation on the algorithm argument in AEAD 
Corresponds better to the validation done in other modules of PSA Crypto.

Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
 2021-04-07 16:03:31 +02:00
Ronald Cron
9a986165bf psa: aead: Accept opaque keys for encryption/decryption 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
 2021-04-07 16:03:31 +02:00
Ronald Cron
d17dff38e9 tests: driver wrapper: Add AEAD dispatch testing 
The aead_encrypt and aead_decrypt are lightly
simplified and tweaked versions of test_suite_psa_crypto
test functions with the same names.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>
 2021-04-07 16:03:31 +02:00
Ronald Cron
bfe551d15e tests: Add AEAD transparent test driver hooks 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
 2021-04-07 16:03:31 +02:00
Ronald Cron
de82281541 psa: aead: Add driver delegation 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
 2021-04-07 16:03:31 +02:00
Ronald Cron
46f9178d85 psa: aead: Move AEAD driver entry points to psa_crypto_aead.c 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
 2021-04-07 16:03:31 +02:00
Ronald Cron
7ceee8d30a psa: Add psa_crypto_aead.[hc] 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
 2021-04-07 16:03:31 +02:00
Ronald Cron
215633cea4 psa: aead: Implement aead operations as a driver entry point 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
 2021-04-07 16:03:31 +02:00