# [PATCH 1/2] builtin/receive-pack: use check_signature from gpg-interface 2 messages from 2018-07-11 to 2018-07-11. Participants: Henning Schild. Thread: https://gitlist.dev/t/48860 ## Henning Schild, 2018-07-11 08:38 Subject: [PATCH 1/2] builtin/receive-pack: use check_signature from gpg-interface Message-ID: URL: https://gitlist.dev/e/f9e371c8dd2a17ddb5fd5989a7fdad1c0d1bb6e7.1531298241.git.henning.schild%40siemens.com ``` The combination of verify_signed_buffer followed by parse_gpg_output is available as check_signature. Use that instead of implementing it again. Signed-off-by: Henning Schild --- builtin/receive-pack.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 68d36e0a5..9f0583deb 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -629,8 +629,6 @@ static void prepare_push_cert_sha1(struct child_process *proc) return; if (!already_done) { - struct strbuf gpg_output = STRBUF_INIT; - struct strbuf gpg_status = STRBUF_INIT; int bogs /* beginning_of_gpg_sig */; already_done = 1; @@ -639,22 +637,11 @@ static void prepare_push_cert_sha1(struct child_process *proc) oidclr(&push_cert_oid); memset(&sigcheck, '\0', sizeof(sigcheck)); - sigcheck.result = 'N'; bogs = parse_signature(push_cert.buf, push_cert.len); - if (verify_signed_buffer(push_cert.buf, bogs, - push_cert.buf + bogs, push_cert.len - bogs, - &gpg_output, &gpg_status) < 0) { - ; /* error running gpg */ - } else { - sigcheck.payload = push_cert.buf; - sigcheck.gpg_output = gpg_output.buf; - sigcheck.gpg_status = gpg_status.buf; - parse_gpg_output(&sigcheck); - } + check_signature(push_cert.buf, bogs, push_cert.buf + bogs, + push_cert.len - bogs, &sigcheck); - strbuf_release(&gpg_output); - strbuf_release(&gpg_status); nonce_status = check_nonce(push_cert.buf, bogs); } if (!is_null_oid(&push_cert_oid)) { -- 2.16.4 ``` ## Henning Schild, 2018-07-11 08:38 Subject: [PATCH 2/2] gpg-interface: make parse_gpg_output static and remove from interface header Message-ID: URL: https://gitlist.dev/e/b568214bffb7f2dcaf2495990c5a6b478863d157.1531298241.git.henning.schild%40siemens.com In-Reply-To: ``` Turn parse_gpg_output into a static function, the only outside user was migrated in an earlier commit. Signed-off-by: Henning Schild --- gpg-interface.c | 2 +- gpg-interface.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/gpg-interface.c b/gpg-interface.c index 0647bd634..09ddfbc26 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -35,7 +35,7 @@ static struct { { 'R', "\n[GNUPG:] REVKEYSIG "}, }; -void parse_gpg_output(struct signature_check *sigc) +static void parse_gpg_output(struct signature_check *sigc) { const char *buf = sigc->gpg_status; int i; diff --git a/gpg-interface.h b/gpg-interface.h index a5e6517ae..5ecff4aa0 100644 --- a/gpg-interface.h +++ b/gpg-interface.h @@ -33,8 +33,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 -- 2.16.4 ```