Merge pull request #272 from ARM-software/crypto1.0

Crypto1.0