Fix bug with key material expecting s2k.type to exist which breaks with
passphrase-free keys.