summaryrefslogtreecommitdiff
path: root/gpg-interface.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-03-05 18:43:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-05 18:43:05 (GMT)
commite63cefb024895fcff4b692cad84cb33ac4c81dcc (patch)
tree75658b419b1a097b7bdce369262361323e6c8b7e /gpg-interface.h
parent5da7329e29db93a93099bfee2a81171392341ac8 (diff)
parent0106b1d4be166fd4f7bcf0b901d50940c9f539e2 (diff)
downloadgit-e63cefb024895fcff4b692cad84cb33ac4c81dcc.zip
git-e63cefb024895fcff4b692cad84cb33ac4c81dcc.tar.gz
git-e63cefb024895fcff4b692cad84cb33ac4c81dcc.tar.bz2
Merge branch 'hi/gpg-use-check-signature'
"git merge signed-tag" while lacking the public key started to say "No signature", which was utterly wrong. This regression has been reverted. * hi/gpg-use-check-signature: Revert "gpg-interface: prefer check_signature() for GPG verification"
Diffstat (limited to 'gpg-interface.h')
-rw-r--r--gpg-interface.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/gpg-interface.h b/gpg-interface.h
index f4e9b4f..796571e 100644
--- a/gpg-interface.h
+++ b/gpg-interface.h
@@ -54,6 +54,15 @@ size_t parse_signature(const char *buf, size_t size);
int sign_buffer(struct strbuf *buffer, struct strbuf *signature,
const char *signing_key);
+/*
+ * Run "gpg" to see if the payload matches the detached signature.
+ * gpg_output, when set, receives the diagnostic output from GPG.
+ * gpg_status, when set, receives the status output from GPG.
+ */
+int verify_signed_buffer(const char *payload, size_t payload_size,
+ const char *signature, size_t signature_size,
+ struct strbuf *gpg_output, struct strbuf *gpg_status);
+
int git_gpg_config(const char *, const char *, void *);
void set_signing_key(const char *);
const char *get_signing_key(void);