From owner-p4-projects@FreeBSD.ORG  Sat Sep 23 18:05:35 2006
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 D076816A5C4; Sat, 23 Sep 2006 18:05:34 +0000 (UTC)
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 6C6D916A407
	for <perforce@freebsd.org>; Sat, 23 Sep 2006 18:05:34 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DB53843D6D
	for <perforce@freebsd.org>; Sat, 23 Sep 2006 18:05:33 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8NI5XrT006029
	for <perforce@freebsd.org>; Sat, 23 Sep 2006 18:05:33 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8NI5XkF006026
	for perforce@freebsd.org; Sat, 23 Sep 2006 18:05:33 GMT
	(envelope-from imp@freebsd.org)
Date: Sat, 23 Sep 2006 18:05:33 GMT
Message-Id: <200609231805.k8NI5XkF006026@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 106566 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: Sat, 23 Sep 2006 18:05:35 -0000

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

Change 106566 by imp@imp_paco-paco on 2006/09/23 18:04:48

	compile fix

Affected files ...

.. //depot/projects/usb/src/sys/dev/ubsec/ubsec.c#2 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/ubsec/ubsec.c#2 (text+ko) ====

@@ -937,7 +937,7 @@
 			MD5Update(&md5ctx, macini->cri_key,
 			    macini->cri_klen / 8);
 			MD5Update(&md5ctx, hmac_ipad_buffer,
-			    HMAC_BLOCK_LEN - (macini->cri_klen / 8));
+			    MD5_HMAC_BLOCK_LEN - (macini->cri_klen / 8));
 			bcopy(md5ctx.state, ses->ses_hminner,
 			    sizeof(md5ctx.state));
 		} else {
@@ -945,7 +945,7 @@
 			SHA1Update(&sha1ctx, macini->cri_key,
 			    macini->cri_klen / 8);
 			SHA1Update(&sha1ctx, hmac_ipad_buffer,
-			    HMAC_BLOCK_LEN - (macini->cri_klen / 8));
+			    SHA1_HMAC_BLOCK_LEN - (macini->cri_klen / 8));
 			bcopy(sha1ctx.h.b32, ses->ses_hminner,
 			    sizeof(sha1ctx.h.b32));
 		}
@@ -958,7 +958,7 @@
 			MD5Update(&md5ctx, macini->cri_key,
 			    macini->cri_klen / 8);
 			MD5Update(&md5ctx, hmac_opad_buffer,
-			    HMAC_BLOCK_LEN - (macini->cri_klen / 8));
+			    MD5_HMAC_BLOCK_LEN - (macini->cri_klen / 8));
 			bcopy(md5ctx.state, ses->ses_hmouter,
 			    sizeof(md5ctx.state));
 		} else {
@@ -966,7 +966,7 @@
 			SHA1Update(&sha1ctx, macini->cri_key,
 			    macini->cri_klen / 8);
 			SHA1Update(&sha1ctx, hmac_opad_buffer,
-			    HMAC_BLOCK_LEN - (macini->cri_klen / 8));
+			    SHA1_HMAC_BLOCK_LEN - (macini->cri_klen / 8));
 			bcopy(sha1ctx.h.b32, ses->ses_hmouter,
 			    sizeof(sha1ctx.h.b32));
 		}