Move psasim into framework

[minosgalanakis]

Description

Part of the work required by Mbed-TLS/mbedtls#10487. Psasim was originally placed in framework directory, but moved to mbedtls while we were workign on it. Now this PR is migrating it back, while preserving the history

• TF-PSA-Crypto PR provided Update framework with psasim move TF-PSA-Crypto#678
• development PR provided Rework/move psasim mbedtls#10511
• 3.6 PR provided # | not required because: psasim is not part of 3.6 LTS

[minosgalanakis]

This PR was created again based on latest development and using the mbedtls-move-to-framework. The command used to create is are:

python /Users/mingal01/dev/git/mbedtls-docs/tools/bin/mbedtls-move-to-framework \
  --from /Users/mingal01/dev/git/test_move_26/mbedtls \
  --to /Users/mingal01/dev/git/test_move_26/mbedtls-framework \
  --path tests/psa-client-server/psasim:psasim

Eventually the script will break because it is impossible to automatically merge the branch into the framework. In addition to the reasons for doing so discussed above I noticed that we did not migrate the history of framework/psasim on the mbedtls side.

Git does not allow stacking explicitly different git histories for a file on the same tree and even if we merge the histories the --follow will only take the latest path. Also when trying to merge it will be incorrectly import the wrong state of some files.

The process now is:

• Move framework/psasim -> framework/psasim_deprecated
• Move mbedtls/tests/psa-client-server/psasim -> framework/psasim
• Use the MERGE_HEAD as the resolution path for incoming psasim changes since we want the state of the mbedtls side and the ours/theirs is not correct.
• Accept the psasim_deprecated as is.
• Resolve all the other conflicts manually.

Merge conflict resolution

git checkout HEAD -- dco.txt && git add dco.txt
git checkout MERGE_HEAD -- psasim

git add -A psasim
git add -A psasim_deprecated

git rm -f -- \
  tests/psa-client-server/psasim/.gitignore \
  tests/psa-client-server/psasim/include/client.h \
  tests/psa-client-server/psasim/include/init.h \
  tests/psa-client-server/psasim/include/lifecycle.h \
  tests/psa-client-server/psasim/include/service.h \
  tests/psa-client-server/psasim/src/manifest.json \
  tests/psa-client-server/psasim/src/psa_ff_client.c \
  tests/psa-client-server/psasim/src/psa_ff_server.c 
  
git checkout --ours -- \
  .github/pull_request_template.md \
  .gitignore \
  CMakeLists.txt \
  CONTRIBUTING.md \
  LICENSE \
  README.md \
  scripts/lcov.sh \
  scripts/mbedtls_framework/interface_checks.py \
  scripts/project_scripts.py \
  scripts/sbom.cdx.json \
  tests/.gitignore \
  tests/.jenkins/Jenkinsfile

git add -- \
  .github/pull_request_template.md \
  .gitignore \
  CMakeLists.txt \
  CONTRIBUTING.md \
  LICENSE \
  README.md \
  scripts/lcov.sh \
  scripts/mbedtls_framework/interface_checks.py \
  scripts/project_scripts.py \
  scripts/sbom.cdx.json \
  tests/.gitignore \
  tests/.jenkins/Jenkinsfile

[gilles-peskine-arm]

At fc4689b, looks good to me for moving psasim while preserving the history in the mbedtls repository up to 0294b11.

The commit message d982361 is inaccurate (it's not yet moving anything to the framework, and it's also removing files, not just moving them), but that's not worth redoing the merge.

I'll submit another review for the subsequent code changes.

[gilles-peskine-arm]

LGTM at f51cf54

[gilles-peskine-arm]

Why not test for tests/psa-client-server/psasim, since that's what we care about?

[davidhorstmann-arm]

LGTM, thanks!

I've checked that the new psasim directory is consistent with mbedtls (except for a path change) and that the subsequent changes make sense.