Gilles Peskine 2938268fb4 Merge remote-tracking branch 'upstream-crypto/development' into psa-api-1.0-beta-merge_development_20190524 ... Conflicts: * library/ssl_cli.c, library/ssl_tls.c: Removed on the development branch. Keep them removed. * include/psa/crypto_extra.h, library/psa_crypto_storage.c, tests/suites/test_suite_psa_crypto.data, tests/suites/test_suite_psa_crypto.function, tests/suites/test_suite_psa_crypto_persistent_key.data, tests/suites/test_suite_psa_crypto_slot_management.data, tests/suites/test_suite_psa_crypto_slot_management.function: Modified on the development branch only to implement the enrollment algorithm, which has been reimplemented on the API branch. Keep the API branch.		2019-05-29 09:57:29 +02:00
..
mbedtls	Merge remote-tracking branch 'upstream-crypto/development' into psa-api-1.0-beta-merge_development_20190524	2019-05-29 09:57:29 +02:00
psa	Minor documentation improvements	2019-05-27 14:08:27 +02:00
.gitignore	Rename include directory to mbedtls	2015-03-10 11:23:56 +00:00
CMakeLists.txt	Remove tests that depend on TLS or X.509	2019-03-11 16:49:26 +00:00