summaryrefslogtreecommitdiff
path: root/builtin/verify-tag.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-08 19:24:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-08 19:24:13 (GMT)
commita5066a0b07deb76327e3e3ea845afc899e256c51 (patch)
treea3107af36d1982864c3e5d80fb6f7086ba9dd682 /builtin/verify-tag.c
parent657072f3ac5519f146a947253c9959909b38c293 (diff)
parent3d5854e765dedfaf2a942e8fa1e950a40f9dcee3 (diff)
downloadgit-a5066a0b07deb76327e3e3ea845afc899e256c51.zip
git-a5066a0b07deb76327e3e3ea845afc899e256c51.tar.gz
git-a5066a0b07deb76327e3e3ea845afc899e256c51.tar.bz2
Merge branch 'mg/maint-tag-rfc1991'
* mg/maint-tag-rfc1991: tag: recognize rfc1991 signatures tag: factor out sig detection for tag display tag: factor out sig detection for body edits verify-tag: factor out signature detection t/t7004-tag: test handling of rfc1991 signatures
Diffstat (limited to 'builtin/verify-tag.c')
-rw-r--r--builtin/verify-tag.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index 8136dba..3134766 100644
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -17,13 +17,11 @@ static const char * const verify_tag_usage[] = {
NULL
};
-#define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
-
static int run_gpg_verify(const char *buf, unsigned long size, int verbose)
{
struct child_process gpg;
const char *args_gpg[] = {"gpg", "--verify", "FILE", "-", NULL};
- char path[PATH_MAX], *eol;
+ char path[PATH_MAX];
size_t len;
int fd, ret;
@@ -37,11 +35,7 @@ static int run_gpg_verify(const char *buf, unsigned long size, int verbose)
close(fd);
/* find the length without signature */
- len = 0;
- while (len < size && prefixcmp(buf + len, PGP_SIGNATURE)) {
- eol = memchr(buf + len, '\n', size - len);
- len += eol ? eol - (buf + len) + 1 : size - len;
- }
+ len = parse_signature(buf, size);
if (verbose)
write_in_full(1, buf, len);