Merge https://github.com/martin-rublik/Applied-Crypto-Hardening