[PATCH] Update tags to record who made them
And finally what all of this has been leading up to. The 2 line code change to record who made a tag, and the 8 line code change to check that we recorded the tag. Gosh the error checking is always so much bigger than the code :) Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
ec3f5a46ea
commit
c818566d5c
10
mktag.c
10
mktag.c
@ -42,7 +42,7 @@ static int verify_tag(char *buffer, unsigned long size)
|
||||
int typelen;
|
||||
char type[20];
|
||||
unsigned char sha1[20];
|
||||
const char *object, *type_line, *tag_line;
|
||||
const char *object, *type_line, *tag_line, *tagger_line;
|
||||
|
||||
if (size < 64 || size > MAXSIZE-1)
|
||||
return -1;
|
||||
@ -92,6 +92,12 @@ static int verify_tag(char *buffer, unsigned long size)
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Verify the tagger line */
|
||||
tagger_line = tag_line;
|
||||
|
||||
if (memcmp(tagger_line, "tagger", 6) || (tagger_line[6] == '\n'))
|
||||
return -1;
|
||||
|
||||
/* The actual stuff afterwards we don't care about.. */
|
||||
return 0;
|
||||
}
|
||||
@ -119,7 +125,7 @@ int main(int argc, char **argv)
|
||||
size += ret;
|
||||
}
|
||||
|
||||
// Verify it for some basic sanity: it needs to start with "object <sha1>\ntype "
|
||||
// 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");
|
||||
|
||||
|
Reference in New Issue
Block a user