tree 8cd5d1697e685b26faeb07e2aa3adb824a841fad
parent 6326a8dd37990beff4b488aff1ea7f9138edcf91
parent b6800788ca432e8df1de3c7a55e894b9a2e49ba9
author Mateusz Starzyk <mateusz.starzyk@mobica.com> 1620652688 +0200
committer Mateusz Starzyk <mateusz.starzyk@mobica.com> 1621417069 +0200

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.