Add static values for GNU protection modes in PGP S2K class
Add static values for GNU protection modes in PGP S2K class

Conflicts:
	pg/src/main/java/org/spongycastle/bcpg/S2K.java

iseki-masaya/spongycastle,iseki-masaya/spongycastle,iseki-masaya/spongycastle