Skip to content

Commit

Permalink
gpg-interface: move parse_signature() to where it should be
Browse files Browse the repository at this point in the history
Our signed-tag objects set the standard format used by Git to store
GPG-signed payload (i.e. the payload followed by its detached
signature) [*1*], and it made sense to have a helper to find the
boundary between the payload and its signature in tag.c back then.

Newer code added later to parse other kinds of objects that learned
to use the same format to store GPG-signed payload (e.g. signed
commits), however, kept using the helper from the same location.

Move it to gpg-interface; the helper is no longer about signed tag,
but it is how our code and data interact with GPG.

[Reference]
*1* http://thread.gmane.org/gmane.linux.kernel/297998/focus=1383

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
gitster committed Sep 15, 2014
1 parent a50e7ca commit d7c6766
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 21 deletions.
21 changes: 21 additions & 0 deletions gpg-interface.c
Expand Up @@ -7,6 +7,9 @@
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(sigc->payload);
Expand Down Expand Up @@ -57,6 +60,24 @@ void parse_gpg_output(struct signature_check *sigc)
}
}

/*
* Look at GPG signed content (e.g. a signed tag object), whose
* payload is followed by a detached signature on it. Return the
* offset where the embedded detached signature begins, or the end of
* the data when there is no such signature.
*/
size_t parse_signature(const char *buf, unsigned long size)
{
char *eol;
size_t len = 0;
while (len < size && !starts_with(buf + len, PGP_SIGNATURE) &&
!starts_with(buf + len, PGP_MESSAGE)) {
eol = memchr(buf + len, '\n', size - len);
len += eol ? eol - (buf + len) + 1 : size - len;
}
return len;
}

void set_signing_key(const char *key)
{
free(configured_signing_key);
Expand Down
1 change: 1 addition & 0 deletions gpg-interface.h
Expand Up @@ -20,6 +20,7 @@ struct signature_check {
};

extern void signature_check_clear(struct signature_check *sigc);
extern size_t parse_signature(const char *buf, unsigned long size);
extern void parse_gpg_output(struct signature_check *);
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, struct strbuf *gpg_status);
Expand Down
20 changes: 0 additions & 20 deletions tag.c
Expand Up @@ -4,9 +4,6 @@
#include "tree.h"
#include "blob.h"

#define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
#define PGP_MESSAGE "-----BEGIN PGP MESSAGE-----"

const char *tag_type = "tag";

struct object *deref_tag(struct object *o, const char *warn, int warnlen)
Expand Down Expand Up @@ -143,20 +140,3 @@ int parse_tag(struct tag *item)
free(data);
return ret;
}

/*
* Look at a signed tag object, and return the offset where
* the embedded detached signature begins, or the end of the
* data when there is no such signature.
*/
size_t parse_signature(const char *buf, unsigned long size)
{
char *eol;
size_t len = 0;
while (len < size && !starts_with(buf + len, PGP_SIGNATURE) &&
!starts_with(buf + len, PGP_MESSAGE)) {
eol = memchr(buf + len, '\n', size - len);
len += eol ? eol - (buf + len) + 1 : size - len;
}
return len;
}
1 change: 0 additions & 1 deletion tag.h
Expand Up @@ -17,6 +17,5 @@ extern int parse_tag_buffer(struct tag *item, const void *data, unsigned long si
extern int parse_tag(struct tag *item);
extern struct object *deref_tag(struct object *, const char *, int);
extern struct object *deref_tag_noverify(struct object *);
extern size_t parse_signature(const char *buf, unsigned long size);

#endif /* TAG_H */

0 comments on commit d7c6766

Please sign in to comment.