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