Merge remote-tracking branch 'upstream/development' into psa-m-aead-merge

Browse Source

Also fiixed the following merge problems:

crypto_struct.h   : Added MBEDTLS_PRIVATE to psa_aead_operation_s
                    members (merge conflict)
psa_crypto_aead.c : Added ciphertext_length to mbedtls_gcm_finish
                    call (change of API during development)

Signed-off-by: Paul Elliott <paul.elliott@arm.com>

...

This commit is contained in:

Paul Elliott

2021-09-24 11:18:13 +01:00

parent 3db0b70263 f0f2294f57

commit 71b0567c87

542 changed files with 27388 additions and 25216 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

741

library/psa_crypto.c

File diff suppressed because it is too large Load Diff