mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-02-06 03:40:04 +00:00
4228f895c0
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.