undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hs/push-cert-check-cleanup'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2018-07-24 14:50:48 -07:00
commit 6fc7de1a1f
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/receive-pack.c
View File

@ -630,8 +630,6 @@ static void prepare_push_cert_sha1(struct child_process *proc)
return; return;
if (!already_done) { if (!already_done) {
struct strbuf gpg_output = STRBUF_INIT;
struct strbuf gpg_status = STRBUF_INIT;
int bogs /* beginning_of_gpg_sig */; int bogs /* beginning_of_gpg_sig */;
already_done = 1; already_done = 1;
@ -640,22 +638,11 @@ static void prepare_push_cert_sha1(struct child_process *proc)
oidclr(&push_cert_oid); oidclr(&push_cert_oid);
memset(&sigcheck, '\0', sizeof(sigcheck)); memset(&sigcheck, '\0', sizeof(sigcheck));
sigcheck.result = 'N';
bogs = parse_signature(push_cert.buf, push_cert.len); bogs = parse_signature(push_cert.buf, push_cert.len);
if (verify_signed_buffer(push_cert.buf, bogs, check_signature(push_cert.buf, bogs, push_cert.buf + bogs,
push_cert.buf + bogs, push_cert.len - bogs, push_cert.len - bogs, &sigcheck);
&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);
}
strbuf_release(&gpg_output);
strbuf_release(&gpg_status);
nonce_status = check_nonce(push_cert.buf, bogs); nonce_status = check_nonce(push_cert.buf, bogs);
} }
if (!is_null_oid(&push_cert_oid)) { if (!is_null_oid(&push_cert_oid)) {

2
gpg-interface.c
View File

@ -35,7 +35,7 @@ static struct {
{ 'R', "\n[GNUPG:] REVKEYSIG "}, { '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; const char *buf = sigc->gpg_status;
int i; int i;

2
gpg-interface.h
View File

@ -33,8 +33,6 @@ void signature_check_clear(struct signature_check *sigc);
*/ */
size_t parse_signature(const char *buf, size_t size); 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 * Create a detached signature for the contents of "buffer" and append
* it after "signature"; "buffer" and "signature" can be the same * it after "signature"; "buffer" and "signature" can be the same