Merge https://github.com/krono/Applied-Crypto-Hardening