Gilles Peskine ea2e3604b1 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.		2019-01-19 13:56:35 +01:00
..
mbedtls	Merge branch 'psa_cipher_CRYPTO' into feature-psa-tls-integration-proposed	2018-11-23 15:53:27 +00:00
psa	Merge branch 'psa-copy_key' into psa-api-1.0-beta	2019-01-19 13:56:35 +01:00
.gitignore
CMakeLists.txt	CMake: psa: Enable installing of headers	2018-11-21 12:16:40 +00:00