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

gpg_interface: allow to request status return

Browse Source 
Currently, verify_signed_buffer() returns the user facing output only.

Allow callers to request the status output also.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael J Gruber 2013-02-14 17:04:44 +01:00 committed by Junio C Hamano
parent 1315093f99
commit 9cc4ac8ff1
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/fmt-merge-msg.c
View File

@ -492,7 +492,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
if (size == len) if (size == len)
; /* merely annotated */ ; /* merely annotated */
else if (verify_signed_buffer(buf, len, buf + len, size - len, &sig)) { else if (verify_signed_buffer(buf, len, buf + len, size - len, &sig, NULL)) {
if (!sig.len) if (!sig.len)
strbuf_addstr(&sig, "gpg verification failed.\n"); strbuf_addstr(&sig, "gpg verification failed.\n");
} }

2
builtin/verify-tag.c
View File

@ -29,7 +29,7 @@ static int run_gpg_verify(const char *buf, unsigned long size, int verbose)
if (size == len) if (size == len)
return error("no signature found"); return error("no signature found");
return verify_signed_buffer(buf, len, buf + len, size - len, NULL); return verify_signed_buffer(buf, len, buf + len, size - len, NULL, NULL);
} }
static int verify_tag(const char *name, int verbose) static int verify_tag(const char *name, int verbose)

11
gpg-interface.c
View File

@ -100,13 +100,14 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *sig
*/ */
int verify_signed_buffer(const char *payload, size_t payload_size, int verify_signed_buffer(const char *payload, size_t payload_size,
const char *signature, size_t signature_size, const char *signature, size_t signature_size,
struct strbuf *gpg_output) struct strbuf *gpg_output, struct strbuf *gpg_status)
{ {
struct child_process gpg; struct child_process gpg;
const char *args_gpg[] = {NULL, "--status-fd=1", "--verify", "FILE", "-", NULL}; const char *args_gpg[] = {NULL, "--status-fd=1", "--verify", "FILE", "-", NULL};
char path[PATH_MAX]; char path[PATH_MAX];
int fd, ret; int fd, ret;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct strbuf *pbuf = &buf;
args_gpg[0] = gpg_program; args_gpg[0] = gpg_program;
fd = git_mkstemp(path, PATH_MAX, ".git_vtag_tmpXXXXXX"); fd = git_mkstemp(path, PATH_MAX, ".git_vtag_tmpXXXXXX");
@ -137,15 +138,17 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
strbuf_read(gpg_output, gpg.err, 0); strbuf_read(gpg_output, gpg.err, 0);
close(gpg.err); close(gpg.err);
} }
strbuf_read(&buf, gpg.out, 0); if (gpg_status)
pbuf = gpg_status;
strbuf_read(pbuf, gpg.out, 0);
close(gpg.out); close(gpg.out);
ret = finish_command(&gpg); ret = finish_command(&gpg);
unlink_or_warn(path); unlink_or_warn(path);
ret |= !strstr(buf.buf, "\n[GNUPG:] GOODSIG "); ret |= !strstr(pbuf->buf, "\n[GNUPG:] GOODSIG ");
strbuf_release(&buf); strbuf_release(&buf); /* no matter it was used or not */
return ret; return ret;
} }

2
gpg-interface.h
View File

@ -2,7 +2,7 @@
#define GPG_INTERFACE_H #define GPG_INTERFACE_H
extern int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key); extern int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key);
extern int verify_signed_buffer(const char *payload, size_t payload_size, const char *signature, size_t signature_size, struct strbuf *gpg_output); extern int verify_signed_buffer(const char *payload, size_t payload_size, const char *signature, size_t signature_size, struct strbuf *gpg_output, struct strbuf *gpg_status);
extern int git_gpg_config(const char *, const char *, void *); extern int git_gpg_config(const char *, const char *, void *);
extern void set_signing_key(const char *); extern void set_signing_key(const char *);
extern const char *get_signing_key(void); extern const char *get_signing_key(void);

4
log-tree.c
View File

@ -434,7 +434,7 @@ static void show_signature(struct rev_info *opt, struct commit *commit)
status = verify_signed_buffer(payload.buf, payload.len, status = verify_signed_buffer(payload.buf, payload.len,
signature.buf, signature.len, signature.buf, signature.len,
&gpg_output); &gpg_output, NULL);
if (status && !gpg_output.len) if (status && !gpg_output.len)
strbuf_addstr(&gpg_output, "No signature\n"); strbuf_addstr(&gpg_output, "No signature\n");
@ -503,7 +503,7 @@ static void show_one_mergetag(struct rev_info *opt,
if (verify_signed_buffer(extra->value, payload_size, if (verify_signed_buffer(extra->value, payload_size,
extra->value + payload_size, extra->value + payload_size,
extra->len - payload_size, extra->len - payload_size,
&verify_message)) { &verify_message, NULL)) {
if (verify_message.len <= gpg_message_offset) if (verify_message.len <= gpg_message_offset)
strbuf_addstr(&verify_message, "No signature\n"); strbuf_addstr(&verify_message, "No signature\n");
else else

2
pretty.c
View File

@ -917,7 +917,7 @@ static void parse_commit_signature(struct format_commit_context *ctx)
goto out; goto out;
status = verify_signed_buffer(payload.buf, payload.len, status = verify_signed_buffer(payload.buf, payload.len,
signature.buf, signature.len, signature.buf, signature.len,
&gpg_output); &gpg_output, NULL);
if (status && !gpg_output.len) if (status && !gpg_output.len)
goto out; goto out;
ctx->signature.gpg_output = strbuf_detach(&gpg_output, NULL); ctx->signature.gpg_output = strbuf_detach(&gpg_output, NULL);