diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-07-25 00:50:48 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-07-25 00:50:48 +0300 |
commit | 6fc7de1a1f0cca63899e67cc8e96fbdb3be73019 (patch) | |
tree | 4ab5077c9b388fd608ea7397227d692aa7121e2c /builtin | |
parent | d94cecfe7525606070163437f7c59a51650f9e56 (diff) | |
parent | fbd0f16610362fda5d2093a590a80d693f610594 (diff) |
Merge branch 'hs/push-cert-check-cleanup'
Code clean-up.
* hs/push-cert-check-cleanup:
gpg-interface: make parse_gpg_output static and remove from interface header
builtin/receive-pack: use check_signature from gpg-interface
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/receive-pack.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 44c7c9ee82..f1c5d079f9 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -630,8 +630,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; @@ -640,22 +638,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)) { |