Keyring: simplify API, accept 16 char hex or fingerprint as keyid.