From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jul 2018 21:50:48 +0000 (-0700)
Subject: Merge branch 'hs/push-cert-check-cleanup'
X-Git-Tag: v2.19.0-rc0~125
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6fc7de1a1f0cca63899e67cc8e96fbdb3be73019?hp=-c

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
---

6fc7de1a1f0cca63899e67cc8e96fbdb3be73019
diff --combined builtin/receive-pack.c
index 44c7c9ee82,9f0583deb9..f1c5d079f9
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@@ -25,7 -25,6 +25,7 @@@
  #include "tmp-objdir.h"
  #include "oidset.h"
  #include "packfile.h"
 +#include "object-store.h"
  #include "protocol.h"
  
  static const char * const receive_pack_usage[] = {
@@@ -630,8 -629,6 +630,6 @@@ static void prepare_push_cert_sha1(stru
  		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 -637,11 +638,11 @@@
  			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)) {
@@@ -906,7 -892,7 +893,7 @@@ static int update_shallow_ref(struct co
  	 * not lose these new roots..
  	 */
  	for (i = 0; i < extra.nr; i++)
 -		register_shallow(&extra.oid[i]);
 +		register_shallow(the_repository, &extra.oid[i]);
  
  	si->shallow_ref[cmd->index] = 0;
  	oid_array_clear(&extra);