Mateusz Starzyk 4228f895c0 Merge branch 'development' into convert_NO_SHA384_to_positive ... Conflicts: * configs/config-psa-crypto.h: modified here, removed in development * tests/suites/test_suite_x509parse.data: all conflicts are in depends_on lines where development made a change unrelated to MBEDTLS_SHAxxx and our branch either changed `MBEDTLS_SHA256_C` to `MBEDTLS_SHA224_C` or `MBEDTLS_SHA512_C:!MBEDTLS_SHA512_NO_SHA384` to ``MBEDTLS_SHA384_C`, with no change to what the test does. Pick the other branch's dependency changes then apply our SHA dpeendency change.		2021-05-19 11:37:49 +02:00
..
mbedtls	Merge branch 'development' into convert_NO_SHA384_to_positive	2021-05-19 11:37:49 +02:00
psa	Merge pull request #4433 from bensze01/psa_aead_output_size	2021-04-28 13:30:40 +02:00
.gitignore	Rename include directory to mbedtls	2015-03-10 11:23:56 +00:00
CMakeLists.txt	Revert "Remove tests that depend on TLS or X.509"	2020-03-19 14:17:54 +01:00