Various changes to eventually support openpgp keys in pgp-agent.