packaging: Add contrib installation

[platform/upstream/git.git] / gpg-interface.h

diff --git a/gpg-interface.h b/gpg-interface.h
index a5e6517..f4e9b4f 100644 (file)
--- a/gpg-interface.h
+++ b/gpg-interface.h
@@ -1,10 +1,20 @@
 #ifndef GPG_INTERFACE_H
 #define GPG_INTERFACE_H
 
+struct strbuf;
+
 #define GPG_VERIFY_VERBOSE             1
 #define GPG_VERIFY_RAW                 2
 #define GPG_VERIFY_OMIT_STATUS 4
 
+enum signature_trust_level {
+       TRUST_UNDEFINED,
+       TRUST_NEVER,
+       TRUST_MARGINAL,
+       TRUST_FULLY,
+       TRUST_ULTIMATE,
+};
+
 struct signature_check {
        char *payload;
        char *gpg_output;
@@ -14,13 +24,15 @@ struct signature_check {
         * possible "result":
         * 0 (not checked)
         * N (checked but no further result)
-        * U (untrusted good)
         * G (good)
         * B (bad)
         */
        char result;
        char *signer;
        char *key;
+       char *fingerprint;
+       char *primary_key_fingerprint;
+       enum signature_trust_level trust_level;
 };
 
 void signature_check_clear(struct signature_check *sigc);
@@ -33,8 +45,6 @@ void signature_check_clear(struct signature_check *sigc);
  */
 size_t parse_signature(const char *buf, size_t size);
 
-void parse_gpg_output(struct signature_check *);
-
 /*
  * Create a detached signature for the contents of "buffer" and append
  * it after "signature"; "buffer" and "signature" can be the same
@@ -44,15 +54,6 @@ void parse_gpg_output(struct signature_check *);
 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);