From: Junio C Hamano <gitster@pobox.com>
To: Henning Schild <henning.schild@siemens.com>
Cc: git@vger.kernel.org, Ben Toews <mastahyeti@gmail.com>,
Jeff King <peff@peff.net>, Taylor Blau <me@ttaylorr.com>,
"brian m . carlson" <sandals@crustytoothpaste.net>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH 1/8] builtin/receive-pack: use check_signature from gpg-interface
Date: Fri, 06 Jul 2018 12:51:20 -0700 [thread overview]
Message-ID: <xmqqsh4wjg7b.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <f9e371c8dd2a17ddb5fd5989a7fdad1c0d1bb6e7.1530616446.git.henning.schild@siemens.com> (Henning Schild's message of "Tue, 3 Jul 2018 14:38:13 +0200")
Henning Schild <henning.schild@siemens.com> writes:
> 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 <henning.schild@siemens.com>
> ---
Makes sense.
When d05b9618 ("receive-pack: GPG-validate push certificates",
2014-08-14) implemented the check, there wasn't check_signature()
available. The commit probably should have done what a4cc18f2
("verify-tag: share code with verify-commit", 2015-06-21) later did
to introduce the check_signature() function by factoring it out of
commit.c::check_commit_signature() as a preparatory step.
Will queue. Thanks.
> 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)) {
next prev parent reply other threads:[~2018-07-06 19:51 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-03 12:38 [PATCH 0/8] X509 (gpgsm) commit signing support Henning Schild
2018-07-03 12:38 ` [PATCH 1/8] builtin/receive-pack: use check_signature from gpg-interface Henning Schild
2018-07-06 19:51 ` Junio C Hamano [this message]
2018-07-06 21:35 ` Junio C Hamano
2018-07-09 8:18 ` Henning Schild
2018-07-09 15:55 ` Junio C Hamano
2018-07-03 12:38 ` [PATCH 2/8] gpg-interface: make parse_gpg_output static and remove from interface header Henning Schild
2018-07-03 12:38 ` [PATCH 3/8] gpg-interface: add new config to select how to sign a commit Henning Schild
2018-07-06 1:01 ` brian m. carlson
2018-07-06 8:02 ` Henning Schild
2018-07-06 19:58 ` Junio C Hamano
2018-07-03 12:38 ` [PATCH 4/8] gpg-interface: introduce an abstraction for multiple gpg formats Henning Schild
2018-07-04 7:10 ` Martin Ågren
2018-07-05 13:21 ` Henning Schild
2018-07-06 17:24 ` Junio C Hamano
2018-07-09 8:21 ` Henning Schild
2018-07-09 8:44 ` Eric Sunshine
2018-07-09 15:47 ` Junio C Hamano
2018-07-10 15:37 ` Jeff King
2018-07-10 15:51 ` Junio C Hamano
2018-07-10 15:58 ` Junio C Hamano
2018-07-10 17:15 ` Jeff King
2018-07-03 12:38 ` [PATCH 5/8] t/t7510: check the validation of the new config gpg.format Henning Schild
2018-07-06 20:21 ` Junio C Hamano
2018-07-09 8:27 ` Henning Schild
2018-07-03 12:38 ` [PATCH 6/8] gpg-interface: do not hardcode the key string len anymore Henning Schild
2018-07-06 20:22 ` Junio C Hamano
2018-07-03 12:38 ` [PATCH 7/8] gpg-interface: introduce new signature format "X509" using gpgsm Henning Schild
2018-07-06 1:10 ` brian m. carlson
2018-07-06 8:01 ` Henning Schild
2018-07-06 20:34 ` Junio C Hamano
2018-07-03 12:38 ` [PATCH 8/8] gpg-interface t: extend the existing GPG tests with GPGSM Henning Schild
2018-07-06 1:14 ` brian m. carlson
2018-07-06 8:01 ` Henning Schild
2018-07-06 1:18 ` [PATCH 0/8] X509 (gpgsm) commit signing support brian m. carlson
2018-07-06 8:01 ` Henning Schild
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqsh4wjg7b.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=henning.schild@siemens.com \
--cc=mastahyeti@gmail.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).