From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johan Herland Subject: [PATCH 08/21] Switch from verify_tag() to parse_and_verify_tag_buffer() for verifying tag objects in git-mktag Date: Sat, 09 Jun 2007 02:15:54 +0200 Message-ID: <200706090215.54494.johan@herland.net> References: <7vzm3aig7j.fsf@assigned-by-dhcp.cox.net> <200706090210.36270.johan@herland.net> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 7BIT Cc: Junio C Hamano , Johannes Schindelin To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Jun 09 02:16:01 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1Hwoca-00047O-28 for gcvg-git@gmane.org; Sat, 09 Jun 2007 02:16:00 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030728AbXFIAP7 (ORCPT ); Fri, 8 Jun 2007 20:15:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S969960AbXFIAP6 (ORCPT ); Fri, 8 Jun 2007 20:15:58 -0400 Received: from smtp.getmail.no ([84.208.20.33]:33503 "EHLO smtp.getmail.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S969900AbXFIAP6 (ORCPT ); Fri, 8 Jun 2007 20:15:58 -0400 Received: from pmxchannel-daemon.no-osl-m323-srv-004-z2.isp.get.no by no-osl-m323-srv-004-z2.isp.get.no (Sun Java System Messaging Server 6.2-7.05 (built Sep 5 2006)) id <0JJC00903E2LQ500@no-osl-m323-srv-004-z2.isp.get.no> for git@vger.kernel.org; Sat, 09 Jun 2007 02:15:57 +0200 (CEST) Received: from smtp.getmail.no ([10.5.16.1]) by no-osl-m323-srv-004-z2.isp.get.no (Sun Java System Messaging Server 6.2-7.05 (built Sep 5 2006)) with ESMTP id <0JJC000MJE2ICO20@no-osl-m323-srv-004-z2.isp.get.no> for git@vger.kernel.org; Sat, 09 Jun 2007 02:15:54 +0200 (CEST) Received: from alpha.herland ([84.210.6.167]) by no-osl-m323-srv-004-z1.isp.get.no (Sun Java System Messaging Server 6.2-7.05 (built Sep 5 2006)) with ESMTP id <0JJC00FTBE2IRBF0@no-osl-m323-srv-004-z1.isp.get.no> for git@vger.kernel.org; Sat, 09 Jun 2007 02:15:54 +0200 (CEST) In-reply-to: <200706090210.36270.johan@herland.net> Content-disposition: inline User-Agent: KMail/1.9.7 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: This involves exposing parse_and_verify_tag_buffer() in the tag API (tag.h). Also synchronize selftest with change in error message. Signed-off-by: Johan Herland --- mktag.c | 5 ++--- t/t3800-mktag.sh | 2 +- tag.c | 2 +- tag.h | 2 ++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mktag.c b/mktag.c index 2e70504..5780f33 100644 --- a/mktag.c +++ b/mktag.c @@ -125,9 +125,8 @@ int main(int argc, char **argv) } buffer[size] = 0; - /* Verify it for some basic sanity: it needs to start with - "object \ntype\ntagger " */ - if (verify_tag(buffer, size) < 0) + /* Verify tag object data */ + if (parse_and_verify_tag_buffer(0, buffer, size, 1)) die("invalid tag signature file"); if (write_sha1_file(buffer, size, tag_type, result_sha1) < 0) diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh index b4edb4d..0e87d2a 100755 --- a/t/t3800-mktag.sh +++ b/t/t3800-mktag.sh @@ -34,7 +34,7 @@ too short for a tag EOF cat >expect.pat <