Signed-off-by: Björn Engelmann <BjEngelmann@xxxxxx>
---
51465a979a25c4363010cbab5798d95ac9f102e7
mktag.c | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
51465a979a25c4363010cbab5798d95ac9f102e7
diff --git a/mktag.c b/mktag.c
index f1598db..6bd45df 100644
--- a/mktag.c
+++ b/mktag.c
@@ -46,41 +46,45 @@ static int verify_tag(char *buffer, unsi
const char *object, *type_line, *tag_line, *tagger_line;
if (size < 64)
- return -1;
+ return error("wanna fool me ? you obviously got the size wrong !\n");
+
buffer[size] = 0;
/* Verify object line */
object = buffer;
if (memcmp(object, "object ", 7))
- return -1;
+ return error("char%d: does not start with \"object \"\n", 0);
+
if (get_sha1_hex(object + 7, sha1))
- return -1;
+ return error("char%d: could not get SHA1 hash\n", 7);
/* Verify type line */
type_line = object + 48;
if (memcmp(type_line - 1, "\ntype ", 6))
- return -1;
+ return error("char%d: could not find \"\\ntype \"\n", 47);
/* Verify tag-line */
tag_line = strchr(type_line, '\n');
if (!tag_line)
- return -1;
+ return error("char%td: could not find next \"\\n\"\n", type_line - buffer);
tag_line++;
if (memcmp(tag_line, "tag ", 4) || tag_line[4] == '\n')
- return -1;
+ return error("char%td: no \"tag \" found\n", tag_line - buffer);
/* Get the actual type */
typelen = tag_line - type_line - strlen("type \n");
if (typelen >= sizeof(type))
- return -1;
+ return error("char%d: type too long\n", (int)(type_line - buffer) + strlen("type \n"));
+
memcpy(type, type_line+5, typelen);
type[typelen] = 0;
/* Verify that the object matches */
if (get_sha1_hex(object + 7, sha1))
- return -1;
+ return error("char%d: could not get SHA1 hash but this is really odd since i got it before !\n", 7);
+
if (verify_object(sha1, type))
- return -1;
+ return error("char%d: could not verify object %s\n", 7, sha1);
/* Verify the tag-name: we don't allow control characters or spaces in it */
tag_line += 4;
@@ -90,14 +94,14 @@ static int verify_tag(char *buffer, unsi
break;
if (c > ' ')
continue;
- return -1;
+ return error("char%td: could not verify tag name\n", tag_line - buffer);
}
/* Verify the tagger line */
tagger_line = tag_line;
if (memcmp(tagger_line, "tagger", 6) || (tagger_line[6] == '\n'))
- return -1;
+ return error("char%td: could not find \"tagger\"\n", tagger_line - buffer);
/* The actual stuff afterwards we don't care about.. */
return 0;
@@ -118,7 +122,7 @@ int main(int argc, char **argv)
free(buffer);
die("could not read from stdin");
}
-
+
// Verify it for some basic sanity: it needs to start with "object <sha1>\ntype\ntagger "
if (verify_tag(buffer, size) < 0)
die("invalid tag signature file");
--
1.3.3.g4309-dirty