yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-27 06:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
2e46e9cf21
mbedtls/include
History
Gilles Peskine 3135184cfc Merge remote-tracking branch 'upstream-crypto/development' into psa-api-beta2-merge-development 
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.
2019-04-09 12:00:00 +02:00
..
mbedtls Merge remote-tracking branch 'tls/development' into development 2019-03-28 16:02:25 +00:00
psa Merge remote-tracking branch 'upstream-crypto/development' into psa-api-beta2-merge-development 2019-04-09 12:00:00 +02:00
.gitignore
CMakeLists.txt Remove tests that depend on TLS or X.509 2019-03-11 16:49:26 +00:00