Add static values for GNU protection modes in PGP S2K class
Merge branch 'spongy-master' of https://github.com/open-keychain/spongycastle into spongy-master