tree fef35f4fe98a3669a0c77709d4c9d2610926ea90
parent b865df005c47169987ba368dc6007939b37fa722
parent 4cb9dde84a4b68c285a943010e96d087a070a5f4
author Gilles Peskine <Gilles.Peskine@arm.com> 1547902595 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> 1547902595 +0100

Merge branch 'psa-copy_key' into psa-api-1.0-beta

New function psa_copy_key().

Conflicts:
* library/psa_crypto.c: trivial conflicts due to consecutive changes.
* tests/suites/test_suite_psa_crypto.data: the same code
  was added on both sides, but with a conflict resolution on one side.
* tests/suites/test_suite_psa_crypto_metadata.function: the same code
  was added on both sides, but with a conflict resolution on one side.