From: Ben Toews <mastahyeti@gmail.com>
To: git@vger.kernel.org
Cc: me@ttaylorr.com, peff@peff.net, mastahyeti@gmail.com
Subject: [PATCH 7/8] gpg-interface: prepare for parsing arbitrary PEM blocks
Date: Mon, 9 Apr 2018 14:41:28 -0600 [thread overview]
Message-ID: <20180409204129.43537-8-mastahyeti@gmail.com> (raw)
In-Reply-To: <20180409204129.43537-1-mastahyeti@gmail.com>
From: Jeff King <peff@peff.net>
In preparation for handling more PEM blocks besides "PGP
SIGNATURE" and "PGP MESSAGE', let's break up the parsing to
parameterize the actual block type.
---
gpg-interface.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/gpg-interface.c b/gpg-interface.c
index 0647bd6348..0ba4a8ac3b 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -9,9 +9,6 @@
static char *configured_signing_key;
static const char *gpg_program = "gpg";
-#define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
-#define PGP_MESSAGE "-----BEGIN PGP MESSAGE-----"
-
void signature_check_clear(struct signature_check *sigc)
{
FREE_AND_NULL(sigc->payload);
@@ -101,10 +98,17 @@ void print_signature_buffer(const struct signature_check *sigc, unsigned flags)
fputs(output, stderr);
}
-static int is_gpg_start(const char *line)
+static int is_pem_start(const char *line)
{
- return starts_with(line, PGP_SIGNATURE) ||
- starts_with(line, PGP_MESSAGE);
+ if (!skip_prefix(line, "-----BEGIN ", &line))
+ return 0;
+ if (!skip_prefix(line, "PGP SIGNATURE", &line) &&
+ !skip_prefix(line, "PGP MESSAGE", &line))
+ return 0;
+ if (!starts_with(line, "-----"))
+ return 0;
+
+ return 1;
}
size_t parse_signature(const char *buf, size_t size)
@@ -114,7 +118,7 @@ size_t parse_signature(const char *buf, size_t size)
while (len < size) {
const char *eol;
- if (is_gpg_start(buf + len))
+ if (is_pem_start(buf + len))
match = len;
eol = memchr(buf + len, '\n', size - len);
--
2.15.1 (Apple Git-101)
next prev parent reply other threads:[~2018-04-09 20:42 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-09 20:41 [PATCH 0/8] gpg-interface: Multiple signing tools Ben Toews
2018-04-09 20:41 ` [PATCH 1/8] gpg-interface: handle bool user.signingkey Ben Toews
2018-04-09 20:55 ` Eric Sunshine
2018-04-10 14:32 ` Jeff King
2018-04-09 20:41 ` [PATCH 2/8] gpg-interface: modernize function declarations Ben Toews
2018-04-09 20:41 ` [PATCH 3/8] gpg-interface: use size_t for signature buffer size Ben Toews
2018-04-09 20:41 ` [PATCH 4/8] gpg-interface: fix const-correctness of "eol" pointer Ben Toews
2018-04-09 20:41 ` [PATCH 5/8] gpg-interface: extract gpg line matching helper Ben Toews
2018-04-09 20:41 ` [PATCH 6/8] gpg-interface: find the last gpg signature line Ben Toews
2018-04-09 21:13 ` Eric Sunshine
2018-04-10 9:44 ` Junio C Hamano
2018-04-10 14:47 ` Ben Toews
2018-04-10 21:04 ` Junio C Hamano
2018-04-10 22:17 ` Junio C Hamano
2018-04-11 15:19 ` Ben Toews
2018-04-09 20:41 ` Ben Toews [this message]
2018-04-09 20:41 ` [PATCH 8/8] gpg-interface: handle alternative signature types Ben Toews
2018-04-09 21:01 ` Stefan Beller
2018-04-10 8:24 ` Eric Sunshine
2018-04-10 15:00 ` Ben Toews
2018-04-14 19:59 ` brian m. carlson
2018-04-16 5:05 ` Junio C Hamano
2018-04-17 0:12 ` brian m. carlson
2018-04-17 1:54 ` Junio C Hamano
2018-04-17 18:08 ` Ben Toews
2018-04-17 18:33 ` Taylor Blau
2018-05-03 16:03 ` Ben Toews
2018-05-07 9:45 ` Jeff King
2018-05-07 15:18 ` Junio C Hamano
2018-05-07 23:06 ` brian m. carlson
2018-05-08 13:28 ` Jeff King
2018-05-08 23:09 ` brian m. carlson
2018-05-09 8:03 ` Jeff King
2018-04-10 9:35 ` Junio C Hamano
2018-04-10 16:01 ` Ben Toews
2018-04-11 10:11 ` SZEDER Gábor
2018-04-13 21:18 ` [PATCH v2 0/9] gpg-interface: Multiple signing tools Ben Toews
2018-04-13 21:18 ` [PATCH v2 1/9] t7004: fix mistaken tag name Ben Toews
2018-04-13 21:18 ` [PATCH v2 2/9] gpg-interface: handle bool user.signingkey Ben Toews
2018-04-13 21:18 ` [PATCH v2 3/9] gpg-interface: modernize function declarations Ben Toews
2018-04-13 21:18 ` [PATCH v2 4/9] gpg-interface: use size_t for signature buffer size Ben Toews
2018-04-13 21:18 ` [PATCH v2 5/9] gpg-interface: fix const-correctness of "eol" pointer Ben Toews
2018-04-13 21:18 ` [PATCH v2 6/9] gpg-interface: extract gpg line matching helper Ben Toews
2018-04-13 21:18 ` [PATCH v2 7/9] gpg-interface: find the last gpg signature line Ben Toews
2018-04-13 21:18 ` [PATCH v2 8/9] gpg-interface: prepare for parsing arbitrary PEM blocks Ben Toews
2018-04-13 21:18 ` [PATCH v2 9/9] gpg-interface: handle alternative signature types Ben Toews
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180409204129.43537-8-mastahyeti@gmail.com \
--to=mastahyeti@gmail.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).