tree e09ff86ed7373e07f57a8b453e601f4552bb1f45
parent 8ae15ddcf8417991a5ddbcb2dc7646c5850533c8
parent d668baebc5e1709f4118aba3802d9af0ee4e4d83
author Gilles Peskine <Gilles.Peskine@arm.com> 1546680467 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> 1546680467 +0100

Merge remote-tracking branch 'upstream-crypto/development' into all_sh-mbedcrypto

Merge the work on all.sh that was done on mbedtls-2.14.0 with the
changes from mbedtls-2.14.0 to the current tip of mbed-crypto/development.

There is a merge conflict in test/scripts/all.sh, which is the only
file that was modified in the all.sh work branch. I resolved it by
taking the copy from the all.sh branch and applying the changes
between mbedtls-2.14.0 and mbedtls-2.16.0. As evidenced by
`git diff mbedtls-2.14.0 d668baebc5e1709f4118aba3802d9af0ee4e4d83`,
many of the commits in
`git log mbedtls-2.14.0 d668baebc5e1709f4118aba3802d9af0ee4e4d83`
cancelled each other or were redundant with parallel commits that had
also occured via another branch included in mbedtls-2.14.0, leaving
the following differences:

* Removal of one unimportant blank line.
* The changes from db2b8db7150183e15169636027f87c4145e5645c
  "psa: Add storage implementation for files", to turn off
  PSA storage when MBEDTLS_FS_IO is turned off, which I manually
  replayed.