tree f0b723e27b9f106260531bfa9877737c584839d3
parent b2d61e37420eac59606c782b2c3fad9f97ee64d5
parent ac3c319a43c300a1e6bca2a7eba521c4382fad36
author Jaeden Amero <jaeden.amero@arm.com> 1566901108 +0100
committer Jaeden Amero <jaeden.amero@arm.com> 1566901108 +0100

Merge branch 'mbedtls-2.18' into development

Bring Mbed TLS 2.18.0 and 2.18.1 release changes back into the
development branch. We had branched to release 2.18.0 and 2.18.1 in
order to allow those releases to go out without having to block work on
the `development` branch.

Manually resolve conflicts in the Changelog by moving all freshly addded
changes to a new, unreleased version entry.

Reject changes to include/mbedtls/platform.h made in the mbedtls-2.18
branch, as that file is now sourced from Mbed Crypto.

* mbedtls-2.18:
  platform: Include stdarg.h where needed
  Update Mbed Crypto to contain mbed-crypto#152
  CMake: Add a subdirectory build regression test
  README: Enable builds as a CMake subproject
  ChangeLog: Enable builds as a CMake subproject
  Remove use of CMAKE_SOURCE_DIR
  Update library version to 2.18.0