Merge pull request #318 from gilles-peskine-arm/prr_573-remainder-crypto

Finish side-porting commits from mbedtls-restricted that missed the split