{"thread":{"id":"51742","subject":"[PATCH 3/5] Signing API: Migrated to the new signing interface API","startedAt":"2019-08-26T19:58:14Z","lastAt":"2019-08-26T19:58:14Z","messageCount":1,"participants":["Ibrahim El"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"381246","messageId":"GSHQf1g8UZwwtt5kzbA3GmLTulyYELqEIes51wFqZMG6FP5WpWZwsfnsV5cx74e5gbGBgRaNGY1B-SVRi3PMUZoIg3APf9XAa3bLMw8HHDw=@pm.me","threadId":"51742","inReplyTo":null,"subject":"[PATCH 3/5] Signing API: Migrated to the new signing interface API","fromName":"Ibrahim El","fromEmail":"ibrahim.el@pm.me","sentAt":"2019-08-26T19:58:04Z","receivedAt":"2019-08-26T19:58:14Z","isPatch":true,"sender":{"key":"ibrahim.el@pm.me","avatar":null},"body":"From: Ibrahim El Rhezzali <ibrahim.el@pm.me>\n\n0affa9e2a Migrated to the new signing interface API\n\nUpdating the code to use the new signing interface API. Old GPG interface code is commented and not used\n\nSigned-off-by: Ibrahim El <ibrahim.el@pm.me>\n---\n builtin/am.c            |  3 ++-\n builtin/commit-tree.c   |  4 ++--\n builtin/commit.c        |  4 ++--\n builtin/fmt-merge-msg.c |  2 +-\n builtin/log.c           |  4 ++--\n builtin/merge.c         |  4 ++--\n builtin/push.c          |  3 ++-\n builtin/receive-pack.c  |  4 ++--\n builtin/send-pack.c     |  4 ++--\n builtin/tag.c           | 13 +++++++------\n builtin/verify-commit.c | 12 ++++++------\n builtin/verify-tag.c    | 10 +++++-----\n commit.c                | 13 +++++++------\n commit.h                |  4 ++--\n gpg-interface.c         |  5 ++++-\n gpg-interface.h         |  3 +++\n log-tree.c              |  2 +-\n pretty.c                |  8 ++++----\n ref-filter.c            |  1 +\n send-pack.c             |  5 +++--\n sequencer.c             |  3 ++-\n tag.c                   | 10 +++++-----\n 22 files changed, 67 insertions(+), 54 deletions(-)\n\ndiff --git a/builtin/am.c b/builtin/am.c\nindex 78389d08b..a76efdd5d 100644\n--- a/builtin/am.c\n+++ b/builtin/am.c\n@@ -34,6 +34,7 @@\n #include \"string-list.h\"\n #include \"packfile.h\"\n #include \"repository.h\"\n+#include \"signing-interface.h\"\n \n /**\n  * Returns the length of the first line of msg.\n@@ -2143,7 +2144,7 @@ static int git_am_config(const char *k, const char *v, void *cb)\n {\n \tint status;\n \n-\tstatus = git_gpg_config(k, v, NULL);\n+\tstatus = git_signing_config(k, v, NULL);\n \tif (status)\n \t\treturn status;\n \ndiff --git a/builtin/commit-tree.c b/builtin/commit-tree.c\nindex b866d8395..06bc5016d 100644\n--- a/builtin/commit-tree.c\n+++ b/builtin/commit-tree.c\n@@ -11,7 +11,7 @@\n #include \"tree.h\"\n #include \"builtin.h\"\n #include \"utf8.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n #include \"parse-options.h\"\n \n static const char * const commit_tree_usage[] = {\n@@ -38,7 +38,7 @@ static void new_parent(struct commit *parent, struct commit_list **parents_p)\n \n static int commit_tree_config(const char *var, const char *value, void *cb)\n {\n-\tint status = git_gpg_config(var, value, NULL);\n+\tint status = git_signing_config(var, value, NULL);\n \tif (status)\n \t\treturn status;\n \treturn git_default_config(var, value, cb);\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 1c9e8e222..3b446a029 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -29,7 +29,7 @@\n #include \"unpack-trees.h\"\n #include \"quote.h\"\n #include \"submodule.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n #include \"column.h\"\n #include \"sequencer.h\"\n #include \"mailmap.h\"\n@@ -1437,7 +1437,7 @@ static int git_commit_config(const char *k, const char *v, void *cb)\n \t\treturn 0;\n \t}\n \n-\tstatus = git_gpg_config(k, v, NULL);\n+\tstatus = git_signing_config(k, v, NULL);\n \tif (status)\n \t\treturn status;\n \treturn git_status_config(k, v, s);\ndiff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c\nindex a4615587f..2dd0e9367 100644\n--- a/builtin/fmt-merge-msg.c\n+++ b/builtin/fmt-merge-msg.c\n@@ -10,7 +10,7 @@\n #include \"string-list.h\"\n #include \"branch.h\"\n #include \"fmt-merge-msg.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n #include \"repository.h\"\n #include \"commit-reach.h\"\n \ndiff --git a/builtin/log.c b/builtin/log.c\nindex 7c8767d3b..96507f0d9 100644\n--- a/builtin/log.c\n+++ b/builtin/log.c\n@@ -28,7 +28,7 @@\n #include \"streaming.h\"\n #include \"version.h\"\n #include \"mailmap.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n #include \"progress.h\"\n #include \"commit-slab.h\"\n #include \"repository.h\"\n@@ -465,7 +465,7 @@ static int git_log_config(const char *var, const char *value, void *cb)\n \n \tif (grep_config(var, value, cb) < 0)\n \t\treturn -1;\n-\tif (git_gpg_config(var, value, cb) < 0)\n+\tif (git_signing_config(var, value, cb) < 0)\n \t\treturn -1;\n \treturn git_diff_ui_config(var, value, cb);\n }\ndiff --git a/builtin/merge.c b/builtin/merge.c\nindex 6e99aead4..67a0bcb35 100644\n--- a/builtin/merge.c\n+++ b/builtin/merge.c\n@@ -31,7 +31,7 @@\n #include \"resolve-undo.h\"\n #include \"remote.h\"\n #include \"fmt-merge-msg.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n #include \"sequencer.h\"\n #include \"string-list.h\"\n #include \"packfile.h\"\n@@ -636,7 +636,7 @@ static int git_merge_config(const char *k, const char *v, void *cb)\n \tstatus = fmt_merge_msg_config(k, v, cb);\n \tif (status)\n \t\treturn status;\n-\tstatus = git_gpg_config(k, v, NULL);\n+\tstatus = git_signing_config(k, v, NULL);\n \tif (status)\n \t\treturn status;\n \treturn git_diff_ui_config(k, v, cb);\ndiff --git a/builtin/push.c b/builtin/push.c\nindex 021dd3b1e..74a6758cd 100644\n--- a/builtin/push.c\n+++ b/builtin/push.c\n@@ -14,6 +14,7 @@\n #include \"submodule-config.h\"\n #include \"send-pack.h\"\n #include \"color.h\"\n+#include \"signing-interface.h\"\n \n static const char * const push_usage[] = {\n \tN_(\"git push [<options>] [<repository> [<refspec>...]]\"),\n@@ -479,7 +480,7 @@ static int git_push_config(const char *k, const char *v, void *cb)\n \tint *flags = cb;\n \tint status;\n \n-\tstatus = git_gpg_config(k, v, NULL);\n+\tstatus = git_signing_config(k, v, NULL);\n \tif (status)\n \t\treturn status;\n \ndiff --git a/builtin/receive-pack.c b/builtin/receive-pack.c\nindex 77b712245..1a90dea5a 100644\n--- a/builtin/receive-pack.c\n+++ b/builtin/receive-pack.c\n@@ -19,7 +19,7 @@\n #include \"argv-array.h\"\n #include \"version.h\"\n #include \"tag.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n #include \"sigchain.h\"\n #include \"fsck.h\"\n #include \"tmp-objdir.h\"\n@@ -73,7 +73,7 @@ static int shallow_update;\n static const char *alt_shallow_file;\n static struct strbuf push_cert = STRBUF_INIT;\n static struct object_id push_cert_oid;\n-static struct signature_check sigcheck;\n+static struct signature sigcheck;\n static const char *push_cert_nonce;\n static const char *cert_nonce_seed;\n \ndiff --git a/builtin/send-pack.c b/builtin/send-pack.c\nindex 098ebf22d..ba21fb2df 100644\n--- a/builtin/send-pack.c\n+++ b/builtin/send-pack.c\n@@ -12,7 +12,7 @@\n #include \"transport.h\"\n #include \"version.h\"\n #include \"sha1-array.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n #include \"gettext.h\"\n #include \"protocol.h\"\n \n@@ -101,7 +101,7 @@ static void print_helper_status(struct ref *ref)\n \n static int send_pack_config(const char *k, const char *v, void *cb)\n {\n-\tgit_gpg_config(k, v, NULL);\n+\tgit_signing_config(k, v, NULL);\n \n \tif (!strcmp(k, \"push.gpgsign\")) {\n \t\tconst char *value;\ndiff --git a/builtin/tag.c b/builtin/tag.c\nindex ef37dccf8..a52aa54c0 100644\n--- a/builtin/tag.c\n+++ b/builtin/tag.c\n@@ -16,7 +16,7 @@\n #include \"parse-options.h\"\n #include \"diff.h\"\n #include \"revision.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n #include \"sha1-array.h\"\n #include \"column.h\"\n #include \"ref-filter.h\"\n@@ -111,10 +111,10 @@ static int verify_tag(const char *name, const char *ref,\n {\n \tint flags;\n \tconst struct ref_format *format = cb_data;\n-\tflags = GPG_VERIFY_VERBOSE;\n+\tflags = OUTPUT_VERBOSE;\n \n \tif (format->format)\n-\t\tflags = GPG_VERIFY_OMIT_STATUS;\n+\t\tflags = OUTPUT_OMIT_STATUS;\n \n \tif (gpg_verify_tag(oid, name, flags))\n \t\treturn -1;\n@@ -127,7 +127,8 @@ static int verify_tag(const char *name, const char *ref,\n \n static int do_sign(struct strbuf *buffer)\n {\n-\treturn sign_buffer(buffer, buffer, get_signing_key());\n+\textern enum signature_type default_type;\n+\treturn sign_buffer(buffer, buffer, get_signing_key(default_type));\n }\n \n static const char tag_template[] =\n@@ -151,7 +152,7 @@ static int git_tag_config(const char *var, const char *value, void *cb)\n \t\treturn 0;\n \t}\n \n-\tstatus = git_gpg_config(var, value, cb);\n+\tstatus = git_signing_config(var, value, cb);\n \tif (status)\n \t\treturn status;\n \tif (!strcmp(var, \"tag.forcesignannotated\")) {\n@@ -447,7 +448,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)\n \n \tif (keyid) {\n \t\topt.sign = 1;\n-\t\tset_signing_key(keyid);\n+\t\tset_signing_key(keyid, default_type);\n \t}\n \tcreate_tag_object = (opt.sign || annotate || msg.given || msgfile);\n \ndiff --git a/builtin/verify-commit.c b/builtin/verify-commit.c\nindex 4b9e823f8..0f701ee70 100644\n--- a/builtin/verify-commit.c\n+++ b/builtin/verify-commit.c\n@@ -14,7 +14,7 @@\n #include \"run-command.h\"\n #include <signal.h>\n #include \"parse-options.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n \n static const char * const verify_commit_usage[] = {\n \t\tN_(\"git verify-commit [-v | --verbose] <commit>...\"),\n@@ -23,7 +23,7 @@ static const char * const verify_commit_usage[] = {\n \n static int run_gpg_verify(struct commit *commit, unsigned flags)\n {\n-\tstruct signature_check signature_check;\n+\tstruct signature signature_check;\n \tint ret;\n \n \tmemset(&signature_check, 0, sizeof(signature_check));\n@@ -31,7 +31,7 @@ static int run_gpg_verify(struct commit *commit, unsigned flags)\n \tret = check_commit_signature(commit, &signature_check);\n \tprint_signature_buffer(&signature_check, flags);\n \n-\tsignature_check_clear(&signature_check);\n+\tsignature_clear(&signature_check);\n \treturn ret;\n }\n \n@@ -55,7 +55,7 @@ static int verify_commit(const char *name, unsigned flags)\n \n static int git_verify_commit_config(const char *var, const char *value, void *cb)\n {\n-\tint status = git_gpg_config(var, value, cb);\n+\tint status = git_signing_config(var, value, cb);\n \tif (status)\n \t\treturn status;\n \treturn git_default_config(var, value, cb);\n@@ -67,7 +67,7 @@ int cmd_verify_commit(int argc, const char **argv, const char *prefix)\n \tunsigned flags = 0;\n \tconst struct option verify_commit_options[] = {\n \t\tOPT__VERBOSE(&verbose, N_(\"print commit contents\")),\n-\t\tOPT_BIT(0, \"raw\", &flags, N_(\"print raw gpg status output\"), GPG_VERIFY_RAW),\n+\t\tOPT_BIT(0, \"raw\", &flags, N_(\"print raw gpg status output\"), OUTPUT_RAW),\n \t\tOPT_END()\n \t};\n \n@@ -79,7 +79,7 @@ int cmd_verify_commit(int argc, const char **argv, const char *prefix)\n \t\tusage_with_options(verify_commit_usage, verify_commit_options);\n \n \tif (verbose)\n-\t\tflags |= GPG_VERIFY_VERBOSE;\n+\t\tflags |= OUTPUT_VERBOSE;\n \n \t/* sometimes the program was terminated because this signal\n \t * was received in the process of writing the gpg input: */\ndiff --git a/builtin/verify-tag.c b/builtin/verify-tag.c\nindex 6fa04b751..d25f47d38 100644\n--- a/builtin/verify-tag.c\n+++ b/builtin/verify-tag.c\n@@ -12,7 +12,7 @@\n #include \"run-command.h\"\n #include <signal.h>\n #include \"parse-options.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n #include \"ref-filter.h\"\n \n static const char * const verify_tag_usage[] = {\n@@ -22,7 +22,7 @@ static const char * const verify_tag_usage[] = {\n \n static int git_verify_tag_config(const char *var, const char *value, void *cb)\n {\n-\tint status = git_gpg_config(var, value, cb);\n+\tint status = git_signing_config(var, value, cb);\n \tif (status)\n \t\treturn status;\n \treturn git_default_config(var, value, cb);\n@@ -35,7 +35,7 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)\n \tstruct ref_format format = REF_FORMAT_INIT;\n \tconst struct option verify_tag_options[] = {\n \t\tOPT__VERBOSE(&verbose, N_(\"print tag contents\")),\n-\t\tOPT_BIT(0, \"raw\", &flags, N_(\"print raw gpg status output\"), GPG_VERIFY_RAW),\n+\t\tOPT_BIT(0, \"raw\", &flags, N_(\"print raw gpg status output\"), OUTPUT_RAW),\n \t\tOPT_STRING(0, \"format\", &format.format, N_(\"format\"), N_(\"format to use for the output\")),\n \t\tOPT_END()\n \t};\n@@ -48,13 +48,13 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)\n \t\tusage_with_options(verify_tag_usage, verify_tag_options);\n \n \tif (verbose)\n-\t\tflags |= GPG_VERIFY_VERBOSE;\n+\t\tflags |= OUTPUT_VERBOSE;\n \n \tif (format.format) {\n \t\tif (verify_ref_format(&format))\n \t\t\tusage_with_options(verify_tag_usage,\n \t\t\t\t\t   verify_tag_options);\n-\t\tflags |= GPG_VERIFY_OMIT_STATUS;\n+\t\tflags |= OUTPUT_OMIT_STATUS;\n \t}\n \n \twhile (i < argc) {\ndiff --git a/commit.c b/commit.c\nindex 8fa1883c6..2727c9231 100644\n--- a/commit.c\n+++ b/commit.c\n@@ -10,7 +10,7 @@\n #include \"revision.h\"\n #include \"notes.h\"\n #include \"alloc.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n #include \"mergesort.h\"\n #include \"commit-slab.h\"\n #include \"prio-queue.h\"\n@@ -953,8 +953,9 @@ static int do_sign_commit(struct strbuf *buf, const char *keyid)\n \telse\n \t\tinspos = eoh - buf->buf + 1;\n \n-\tif (!keyid || !*keyid)\n-\t\tkeyid = get_signing_key();\n+\tif (!keyid || !*keyid) {\n+\t\tkeyid = get_signing_key(default_type);\n+\t}\n \tif (sign_buffer(buf, &sig, keyid)) {\n \t\tstrbuf_release(&sig);\n \t\treturn -1;\n@@ -1092,7 +1093,7 @@ static void handle_signed_tag(struct commit *parent, struct commit_extra_header\n \tfree(buf);\n }\n \n-int check_commit_signature(const struct commit *commit, struct signature_check *sigc)\n+int check_commit_signature(const struct commit *commit, struct signature *sigc)\n {\n \tstruct strbuf payload = STRBUF_INIT;\n \tstruct strbuf signature = STRBUF_INIT;\n@@ -1115,7 +1116,7 @@ int check_commit_signature(const struct commit *commit, struct signature_check *\n void verify_merge_signature(struct commit *commit, int verbosity)\n {\n \tchar hex[GIT_MAX_HEXSZ + 1];\n-\tstruct signature_check signature_check;\n+\tstruct signature signature_check;\n \tmemset(&signature_check, 0, sizeof(signature_check));\n \n \tcheck_commit_signature(commit, &signature_check);\n@@ -1137,7 +1138,7 @@ void verify_merge_signature(struct commit *commit, int verbosity)\n \t\tprintf(_(\"Commit %s has a good GPG signature by %s\\n\"),\n \t\t       hex, signature_check.signer);\n \n-\tsignature_check_clear(&signature_check);\n+\tsignature_clear(&signature_check);\n }\n \n void append_merge_tag_headers(struct commit_list *parents,\ndiff --git a/commit.h b/commit.h\nindex f5295ca7f..f5a942fc5 100644\n--- a/commit.h\n+++ b/commit.h\n@@ -5,7 +5,7 @@\n #include \"tree.h\"\n #include \"strbuf.h\"\n #include \"decorate.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n #include \"string-list.h\"\n #include \"pretty.h\"\n #include \"commit-slab.h\"\n@@ -370,7 +370,7 @@ int remove_signature(struct strbuf *buf);\n  * at all.  This may allocate memory for sig->gpg_output, sig->gpg_status,\n  * sig->signer and sig->key.\n  */\n-int check_commit_signature(const struct commit *commit, struct signature_check *sigc);\n+int check_commit_signature(const struct commit *commit, struct signature *sigc);\n \n /* record author-date for each commit object */\n struct author_date_slab;\ndiff --git a/gpg-interface.c b/gpg-interface.c\nindex 8ed274533..5e7dee6fe 100644\n--- a/gpg-interface.c\n+++ b/gpg-interface.c\n@@ -6,6 +6,7 @@\n #include \"sigchain.h\"\n #include \"tempfile.h\"\n \n+#if 0\n static char *configured_signing_key;\n struct gpg_format {\n \tconst char *name;\n@@ -289,7 +290,7 @@ const char *get_signing_key(void)\n }\n \n int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key)\n-{\n+{\t\n \tstruct child_process gpg = CHILD_PROCESS_INIT;\n \tint ret;\n \tsize_t i, j, bottom;\n@@ -376,3 +377,5 @@ int verify_signed_buffer(const char *payload, size_t payload_size,\n \n \treturn ret;\n }\n+\n+#endif\n\\ No newline at end of file\ndiff --git a/gpg-interface.h b/gpg-interface.h\nindex 3e624ec28..c808d1685 100644\n--- a/gpg-interface.h\n+++ b/gpg-interface.h\n@@ -1,6 +1,7 @@\n #ifndef GPG_INTERFACE_H\n #define GPG_INTERFACE_H\n \n+#if 0\n struct strbuf;\n \n #define GPG_VERIFY_VERBOSE\t\t1\n@@ -65,3 +66,5 @@ void print_signature_buffer(const struct signature_check *sigc,\n \t\t\t    unsigned flags);\n \n #endif\n+\n+#endif\n\\ No newline at end of file\ndiff --git a/log-tree.c b/log-tree.c\nindex 1e56df62a..c13a7e06d 100644\n--- a/log-tree.c\n+++ b/log-tree.c\n@@ -11,7 +11,7 @@\n #include \"refs.h\"\n #include \"string-list.h\"\n #include \"color.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n #include \"sequencer.h\"\n #include \"line-log.h\"\n #include \"help.h\"\ndiff --git a/pretty.c b/pretty.c\nindex ced048525..f315755c3 100644\n--- a/pretty.c\n+++ b/pretty.c\n@@ -10,7 +10,7 @@\n #include \"notes.h\"\n #include \"color.h\"\n #include \"reflog-walk.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n #include \"trailer.h\"\n \n static char *user_format;\n@@ -771,7 +771,7 @@ struct format_commit_context {\n \tconst struct pretty_print_context *pretty_ctx;\n \tunsigned commit_header_parsed:1;\n \tunsigned commit_message_parsed:1;\n-\tstruct signature_check signature_check;\n+\tstruct signature signature_check;\n \tenum flush_type flush_type;\n \tenum trunc_type truncate;\n \tconst char *message;\n@@ -1292,8 +1292,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */\n \t\t\tcheck_commit_signature(c->commit, &(c->signature_check));\n \t\tswitch (placeholder[1]) {\n \t\tcase 'G':\n-\t\t\tif (c->signature_check.gpg_output)\n-\t\t\t\tstrbuf_addstr(sb, c->signature_check.gpg_output);\n+\t\t\tif (c->signature_check.output.buf)\n+\t\t\t\tstrbuf_addstr(sb, c->signature_check.output.buf);\n \t\t\tbreak;\n \t\tcase '?':\n \t\t\tswitch (c->signature_check.result) {\ndiff --git a/ref-filter.c b/ref-filter.c\nindex 8500671bc..277fcc04e 100644\n--- a/ref-filter.c\n+++ b/ref-filter.c\n@@ -20,6 +20,7 @@\n #include \"commit-slab.h\"\n #include \"commit-graph.h\"\n #include \"commit-reach.h\"\n+#include \"signing-interface.h\"\n \n static struct ref_msg {\n \tconst char *gone;\ndiff --git a/send-pack.c b/send-pack.c\nindex 6dc16c321..6db779964 100644\n--- a/send-pack.c\n+++ b/send-pack.c\n@@ -13,7 +13,7 @@\n #include \"transport.h\"\n #include \"version.h\"\n #include \"sha1-array.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n #include \"cache.h\"\n \n int option_parse_push_signed(const struct option *opt,\n@@ -269,7 +269,8 @@ static int generate_push_cert(struct strbuf *req_buf,\n {\n \tconst struct ref *ref;\n \tstruct string_list_item *item;\n-\tchar *signing_key = xstrdup(get_signing_key());\n+\textern enum signature_type default_type;\n+\tchar *signing_key = xstrdup(get_signing_key(default_type));\n \tconst char *cp, *np;\n \tstruct strbuf cert = STRBUF_INIT;\n \tint update_seen = 0;\ndiff --git a/sequencer.c b/sequencer.c\nindex ab74b6baf..e3cfe40d2 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -32,6 +32,7 @@\n #include \"alias.h\"\n #include \"commit-reach.h\"\n #include \"rebase-interactive.h\"\n+#include \"signing-interface.h\"\n \n #define GIT_REFLOG_ACTION \"GIT_REFLOG_ACTION\"\n \n@@ -197,7 +198,7 @@ static int git_sequencer_config(const char *k, const char *v, void *cb)\n \t\treturn 0;\n \t}\n \n-\tstatus = git_gpg_config(k, v, NULL);\n+\tstatus = git_signing_config(k, v, NULL);\n \tif (status)\n \t\treturn status;\n \ndiff --git a/tag.c b/tag.c\nindex 7445b8f6e..d9bbf5249 100644\n--- a/tag.c\n+++ b/tag.c\n@@ -5,14 +5,14 @@\n #include \"tree.h\"\n #include \"blob.h\"\n #include \"alloc.h\"\n-#include \"gpg-interface.h\"\n+#include \"signing-interface.h\"\n #include \"packfile.h\"\n \n const char *tag_type = \"tag\";\n \n static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)\n {\n-\tstruct signature_check sigc;\n+\tstruct signature sigc;\n \tsize_t payload_size;\n \tint ret;\n \n@@ -21,7 +21,7 @@ static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)\n \tpayload_size = parse_signature(buf, size);\n \n \tif (size == payload_size) {\n-\t\tif (flags & GPG_VERIFY_VERBOSE)\n+\t\tif (flags & OUTPUT_VERBOSE)\n \t\t\twrite_in_full(1, buf, payload_size);\n \t\treturn error(\"no signature found\");\n \t}\n@@ -29,10 +29,10 @@ static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)\n \tret = check_signature(buf, payload_size, buf + payload_size,\n \t\t\t\tsize - payload_size, &sigc);\n \n-\tif (!(flags & GPG_VERIFY_OMIT_STATUS))\n+\tif (!(flags & OUTPUT_OMIT_STATUS))\n \t\tprint_signature_buffer(&sigc, flags);\n \n-\tsignature_check_clear(&sigc);\n+\tsignature_clear(&sigc);\n \treturn ret;\n }\n \n-- \n2.11.0\n\n\n"}]}