Make SecretKeyPacket use new generalized S2K