3135184cfc
Merge the Mbed Crypto development branch a little after mbedcrypto-1.0.0 into the PSA Crypto API 1.0 beta branch a little after beta 2. Summary of merge conflicts: * Some features (psa_copy_key, public key format without SubjectPublicKeyInfo wrapping) went into both sides, but with a few improvements on the implementation side. For those, take the implementation side. * The key derivation API changed considerably on the API side. This merge commit generally goes with the updated API except in the tests where it keeps some aspects of the implementation. Due to the divergence between the two branches on key derivation and key agreement, test_suite_psa_crypto does not compile. This will be resolved in subsequent commits. |
||
---|---|---|
.. | ||
mbedtls | ||
psa | ||
.gitignore | ||
CMakeLists.txt |