Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge development 2.x into 3.0 (Apr 19) #4366

Merged
Changes from 1 commit
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
9edff74
Fix EC J-PAKE failing when the payload is all-bits-zero
TRodziewicz Mar 4, 2021
782a7ea
ecjpake_zkp_read() now returns ...BAD_INPUT_DATA when r len == 0 and …
tomasz-rodziewicz-mobica Mar 17, 2021
6e47055
Allow changelog entries to have URLs exceeding 80 char limit.
mstarzyk-mobica Mar 24, 2021
9ee8166
Compile URL matching regex before using it in the loop.
mstarzyk-mobica Mar 24, 2021
c8f4489
Use raw string + binary matching for URL regex.
mstarzyk-mobica Mar 25, 2021
5172605
Move URL matching regex to method definition.
mstarzyk-mobica Mar 25, 2021
3cfed58
Move URL regexes to class scope.
mstarzyk-mobica Mar 31, 2021
9b31ad6
Fix error message for long lines with URLs.
mstarzyk-mobica Mar 31, 2021
56c9a94
psa: hash: Fix is_hash_accelerated signature
ronald-cron-arm Apr 1, 2021
e31fd11
psa: include: Fix comments
ronald-cron-arm Apr 1, 2021
06c84ca
psa: include: Merge crypto_builtin_hash.h and crypto_builtin_cipher.h
ronald-cron-arm Apr 1, 2021
dd3b539
psa: include: Clarify scope of crypto_builtin/driver_contexts.h
ronald-cron-arm Apr 1, 2021
980230e
psa: include: Update and improve multipart-op struct design notes
ronald-cron-arm Apr 1, 2021
b13a26c
Add a few unit tests for mbedtls_mpi_read_string with leading zeros
gilles-peskine-arm Apr 3, 2021
80f5673
Fix and simplify sign handling in mbedtls_mpi_read_string
gilles-peskine-arm Apr 3, 2021
ca91ee4
Unit test function for mbedtls_ecp_muladd
gilles-peskine-arm Apr 3, 2021
80ba850
Create a header file for ECP internal functions
gilles-peskine-arm Apr 3, 2021
618be2e
Add unit tests for fix_negative
gilles-peskine-arm Apr 3, 2021
349b372
Fix an incorrect comment about fix_negative
gilles-peskine-arm Apr 3, 2021
ff6a32d
Fix low-probability arithmetic error in ECC
gilles-peskine-arm Apr 3, 2021
93d356c
psa: Export "internally" mbedtls_cipher_info_from_psa
ronald-cron-arm Mar 9, 2021
004f917
psa: aead: Fix status initialization
ronald-cron-arm Mar 16, 2021
197c2fd
psa: aead: Move key resolution
ronald-cron-arm Mar 16, 2021
7dbd800
psa: aead: Isolate key slot unlock from operation abort
ronald-cron-arm Mar 16, 2021
5feb670
Fix the Changelog and extend tests to cover the hash of all-bits zero
tomasz-rodziewicz-mobica Apr 6, 2021
20ad475
Remove trailing spaces
tomasz-rodziewicz-mobica Apr 7, 2021
9f31017
psa: aead: Remove key slot from operation context
ronald-cron-arm Mar 16, 2021
215633c
psa: aead: Implement aead operations as a driver entry point
ronald-cron-arm Mar 16, 2021
7ceee8d
psa: Add psa_crypto_aead.[hc]
ronald-cron-arm Mar 17, 2021
46f9178
psa: aead: Move AEAD driver entry points to psa_crypto_aead.c
ronald-cron-arm Mar 17, 2021
de82281
psa: aead: Add driver delegation
ronald-cron-arm Mar 17, 2021
bfe551d
tests: Add AEAD transparent test driver hooks
ronald-cron-arm Mar 23, 2021
d17dff3
tests: driver wrapper: Add AEAD dispatch testing
ronald-cron-arm Mar 23, 2021
9a98616
psa: aead: Accept opaque keys for encryption/decryption
ronald-cron-arm Mar 26, 2021
ea7ab13
Do validation on the algorithm argument in AEAD
stevew817 Mar 17, 2021
ecbc068
psa: aead: Remove from operation ctx members only used in setup
ronald-cron-arm Mar 26, 2021
b9349a6
psa: aead: Add missing chachapoly context free
ronald-cron-arm Mar 26, 2021
a1971c3
tests: psa: aead: Fix forced error code
ronald-cron-arm Mar 26, 2021
810eb16
psa: aead: Make CCM/GCM ordering consistent
ronald-cron-arm Apr 6, 2021
40de3c9
Fix Changelog, add separate test functions for hash of all-zero bits
tomasz-rodziewicz-mobica Apr 7, 2021
611f043
Correct the new tests names
tomasz-rodziewicz-mobica Apr 7, 2021
0594205
Remove debug statement
tomasz-rodziewicz-mobica Apr 7, 2021
df2e4f2
Merge pull request #4290 from ronald-cron-arm/hash-dispatch-follow-up
ronald-cron-arm Apr 8, 2021
3b1cba8
Fix reference to deprecated macro in documentation
bensze01 Apr 8, 2021
f04c0ed
Merge pull request #4318 from bensze01/ecc_get_family_doc
gilles-peskine-arm Apr 8, 2021
bd43f67
Fix copypasta in test case description
gilles-peskine-arm Apr 9, 2021
392d101
Clarify some comments
gilles-peskine-arm Apr 9, 2021
9a1c092
Merge pull request #4297 from gilles-peskine-arm/ecp-add-fix-202104
gilles-peskine-arm Apr 9, 2021
fd4fab0
mbedtls_mpi_read_string("-0") no longer produces a "negative zero"
gilles-peskine-arm Apr 9, 2021
8f28c24
Explain the problem in more concrete terms
gilles-peskine-arm Apr 9, 2021
c75d9f5
Remove deprecated things from hashing modules
tomasz-rodziewicz-mobica Apr 12, 2021
48f6d0d
fix error.c - now it's autogenerated
tomasz-rodziewicz-mobica Apr 12, 2021
9a86843
fix error.c - second try
tomasz-rodziewicz-mobica Apr 12, 2021
0961e3d
Changelog added
tomasz-rodziewicz-mobica Apr 12, 2021
528b0a6
Merge pull request #4323 from gilles-peskine-arm/ecp-add-fix-changelo…
mpg Apr 13, 2021
09c916a
Merge pull request #4257 from ronald-cron-arm/psa-aead
gilles-peskine-arm Apr 14, 2021
c039514
Merge pull request #4334 from TRodziewicz/origin/remove_old_func_from…
mpg Apr 15, 2021
9013489
Merge pull request #4253 from mstarzyk-mobica/long_url_in_changelog_e…
gilles-peskine-arm Apr 15, 2021
247745f
Revert "Changelog added"
mpg Apr 15, 2021
30dcdf4
Revert "fix error.c - second try"
mpg Apr 15, 2021
1492111
Revert "fix error.c - now it's autogenerated"
mpg Apr 15, 2021
93c0847
Revert "Remove deprecated things from hashing modules"
mpg Apr 15, 2021
cbcefae
Merge pull request #4348 from mpg/revert-4334-dev
yanesca Apr 15, 2021
0bbb38c
Merge pull request #4199 from TRodziewicz/mul_shortcut_fix
mpg Apr 19, 2021
ee25913
Merge branch 'development' into development_3.0
gilles-peskine-arm Apr 19, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix error.c - now it's autogenerated
Signed-off-by: TRodziewicz <[email protected]>
tomasz-rodziewicz-mobica committed Apr 12, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 48f6d0d6e5862a92f8d0aeea1eb65440874d1c18
39 changes: 39 additions & 0 deletions library/error.c
Original file line number Diff line number Diff line change
@@ -239,6 +239,8 @@ const char * mbedtls_high_level_strerr( int error_code )
return( "CIPHER - Authentication failed (for AEAD modes)" );
case -(MBEDTLS_ERR_CIPHER_INVALID_CONTEXT):
return( "CIPHER - The context is invalid. For example, because it was freed" );
case -(MBEDTLS_ERR_CIPHER_HW_ACCEL_FAILED):
return( "CIPHER - Cipher hardware accelerator failed" );
#endif /* MBEDTLS_CIPHER_C */

#if defined(MBEDTLS_DHM_C)
@@ -298,6 +300,8 @@ const char * mbedtls_high_level_strerr( int error_code )
return( "MD - Failed to allocate memory" );
case -(MBEDTLS_ERR_MD_FILE_IO_ERROR):
return( "MD - Opening or reading of file failed" );
case -(MBEDTLS_ERR_MD_HW_ACCEL_FAILED):
return( "MD - MD hardware accelerator failed" );
#endif /* MBEDTLS_MD_C */

#if defined(MBEDTLS_PEM_PARSE_C) || defined(MBEDTLS_PEM_WRITE_C)
@@ -395,6 +399,10 @@ const char * mbedtls_high_level_strerr( int error_code )
return( "RSA - The output buffer for decryption is not large enough" );
case -(MBEDTLS_ERR_RSA_RNG_FAILED):
return( "RSA - The random generator failed to generate non-zeros" );
case -(MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION):
return( "RSA - The implementation does not offer the requested operation, for example, because of security violations or lack of functionality" );
case -(MBEDTLS_ERR_RSA_HW_ACCEL_FAILED):
return( "RSA - RSA hardware accelerator failed" );
#endif /* MBEDTLS_RSA_C */

#if defined(MBEDTLS_SSL_TLS_C)
@@ -593,6 +601,11 @@ const char * mbedtls_low_level_strerr( int error_code )
return( "AES - AES hardware accelerator failed" );
#endif /* MBEDTLS_AES_C */

#if defined(MBEDTLS_ARC4_C)
case -(MBEDTLS_ERR_ARC4_HW_ACCEL_FAILED):
return( "ARC4 - ARC4 hardware accelerator failed" );
#endif /* MBEDTLS_ARC4_C */

#if defined(MBEDTLS_ARIA_C)
case -(MBEDTLS_ERR_ARIA_BAD_INPUT_DATA):
return( "ARIA - Bad input data" );
@@ -758,6 +771,21 @@ const char * mbedtls_low_level_strerr( int error_code )
return( "HMAC_DRBG - The entropy source failed" );
#endif /* MBEDTLS_HMAC_DRBG_C */

#if defined(MBEDTLS_MD2_C)
case -(MBEDTLS_ERR_MD2_HW_ACCEL_FAILED):
return( "MD2 - MD2 hardware accelerator failed" );
#endif /* MBEDTLS_MD2_C */

#if defined(MBEDTLS_MD4_C)
case -(MBEDTLS_ERR_MD4_HW_ACCEL_FAILED):
return( "MD4 - MD4 hardware accelerator failed" );
#endif /* MBEDTLS_MD4_C */

#if defined(MBEDTLS_MD5_C)
case -(MBEDTLS_ERR_MD5_HW_ACCEL_FAILED):
return( "MD5 - MD5 hardware accelerator failed" );
#endif /* MBEDTLS_MD5_C */

#if defined(MBEDTLS_NET_C)
case -(MBEDTLS_ERR_NET_SOCKET_FAILED):
return( "NET - Failed to open a socket" );
@@ -815,17 +843,28 @@ const char * mbedtls_low_level_strerr( int error_code )
return( "POLY1305 - Poly1305 hardware accelerator failed" );
#endif /* MBEDTLS_POLY1305_C */

#if defined(MBEDTLS_RIPEMD160_C)
case -(MBEDTLS_ERR_RIPEMD160_HW_ACCEL_FAILED):
return( "RIPEMD160 - RIPEMD160 hardware accelerator failed" );
#endif /* MBEDTLS_RIPEMD160_C */

#if defined(MBEDTLS_SHA1_C)
case -(MBEDTLS_ERR_SHA1_HW_ACCEL_FAILED):
return( "SHA1 - SHA-1 hardware accelerator failed" );
case -(MBEDTLS_ERR_SHA1_BAD_INPUT_DATA):
return( "SHA1 - SHA-1 input data was malformed" );
#endif /* MBEDTLS_SHA1_C */

#if defined(MBEDTLS_SHA256_C)
case -(MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED):
return( "SHA256 - SHA-256 hardware accelerator failed" );
case -(MBEDTLS_ERR_SHA256_BAD_INPUT_DATA):
return( "SHA256 - SHA-256 input data was malformed" );
#endif /* MBEDTLS_SHA256_C */

#if defined(MBEDTLS_SHA512_C)
case -(MBEDTLS_ERR_SHA512_HW_ACCEL_FAILED):
return( "SHA512 - SHA-512 hardware accelerator failed" );
case -(MBEDTLS_ERR_SHA512_BAD_INPUT_DATA):
return( "SHA512 - SHA-512 input data was malformed" );
#endif /* MBEDTLS_SHA512_C */