diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-10-12 10:35:19 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 10:35:19 -0700 |
commit | e8191a52657ecfc12928cfe9eada80a883111ef2 (patch) | |
tree | 31e4a1539d8a8fd19e7c65de777f6bf9b577dfdf /gpg-interface.h | |
parent | Twelfth batch (diff) | |
parent | ssh signing: test that gpg fails for unknown keys (diff) | |
download | tgif-e8191a52657ecfc12928cfe9eada80a883111ef2.tar.xz |
Merge branch 'fs/ssh-signing' into fs/ssh-signing-fix
* fs/ssh-signing:
ssh signing: test that gpg fails for unknown keys
ssh signing: tests for logs, tags & push certs
ssh signing: duplicate t7510 tests for commits
ssh signing: verify signatures using ssh-keygen
ssh signing: provide a textual signing_key_id
ssh signing: retrieve a default key from ssh-agent
ssh signing: add ssh key format and signing code
ssh signing: add test prereqs
ssh signing: preliminary refactoring and clean-up
Diffstat (limited to 'gpg-interface.h')
-rw-r--r-- | gpg-interface.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gpg-interface.h b/gpg-interface.h index 80567e4894..beefacbb1e 100644 --- a/gpg-interface.h +++ b/gpg-interface.h @@ -17,7 +17,7 @@ enum signature_trust_level { struct signature_check { char *payload; - char *gpg_output; + char *output; char *gpg_status; /* @@ -64,6 +64,12 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature, int git_gpg_config(const char *, const char *, void *); void set_signing_key(const char *); const char *get_signing_key(void); + +/* + * Returns a textual unique representation of the signing key in use + * Either a GPG KeyID or a SSH Key Fingerprint + */ +const char *get_signing_key_id(void); int check_signature(const char *payload, size_t plen, const char *signature, size_t slen, struct signature_check *sigc); |