From owner-p4-projects@FreeBSD.ORG  Thu May 26 15:38:32 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ABA6116A420; Thu, 26 May 2005 15:38:31 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 86AD616A41C
	for <perforce@freebsd.org>; Thu, 26 May 2005 15:38:31 +0000 (GMT)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 68BB943D1D
	for <perforce@freebsd.org>; Thu, 26 May 2005 15:38:31 +0000 (GMT)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4QFcVIA090643
	for <perforce@freebsd.org>; Thu, 26 May 2005 15:38:31 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4QFcVEO090640
	for perforce@freebsd.org; Thu, 26 May 2005 15:38:31 GMT
	(envelope-from csjp@freebsd.org)
Date: Thu, 26 May 2005 15:38:31 GMT
Message-Id: <200505261538.j4QFcVEO090640@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 77513 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 May 2005 15:38:32 -0000

http://perforce.freebsd.org/chv.cgi?CH=77513

Change 77513 by csjp@csjp_xor on 2005/05/26 15:37:54

	-introduce function pointer which will be dynamically initialized
	 to whatever checksum is stored with the object when -W is used.

Affected files ...

.. //depot/projects/trustedbsd/mac/usr.sbin/getfhash/getfhash.c#7 edit

Differences ...

==== //depot/projects/trustedbsd/mac/usr.sbin/getfhash/getfhash.c#7 (text+ko) ====

@@ -207,6 +207,7 @@
 	int nbytes;
 	const char *algo;
 	u_char digest[64];
+	int (*checksum)(const char *, u_char *);
 
 	error = extattr_get_file(pathname, MAC_CHKEXEC_ATTRN,
 	    MAC_CHKEXEC, (void *)&sum, sizeof(sum));
@@ -217,10 +218,12 @@
 	if (sum.vs_flags == MAC_VCSUM_SHA1) {
 		nbytes = SHA1_HASH_SIZE;
 		algo = "sha1";
+		checksum = calc_sha1;
 	}
 	else if (sum.vs_flags == MAC_VCSUM_MD5) {
 		nbytes = MD5_HASH_SIZE;
 		algo = "md5";
+		checksum = calc_md5;
 	} else {
 		warnx("%s: invalid checksum algorithm",
 		    pathname);