+ Use libc mods to force aligned access.

+ Always use the included sha1 source, since libc's may cause
unaligned access.
+ Don't allow weak aliases in included sha1 code.
+ Bump package version number

4 files changed, 9 insertions, 11 deletions

diff --git a/pkgtools/digest/Makefile b/pkgtools/digest/Makefile
index 3295b672d7a..8a28439759a 100644
--- a/pkgtools/digest/Makefile
+++ b/pkgtools/digest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/03/22 09:51:47 agc Exp $
+# $NetBSD: Makefile,v 1.15 2001/03/26 12:57:32 agc Exp $
 #
 # When adding new digest algorithms, please use rmd160 as the template,
 # and bump the VERSION definition.
@@ -12,7 +12,7 @@ MAINTAINER=	agc@netbsd.org
 HOMEPAGE=       http://www.netbsd.org/Documentation/software/packages.html
 COMMENT=	message digest wrapper utility
 
-VERSION=	20010312
+VERSION=	20010319
 
 EXTRACT_ONLY=   # empty
 WRKSRC=		${WRKDIR}
@@ -26,7 +26,7 @@ MAKE_ENV+=	VERSION="${VERSION}"
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${OPSYS} == SunOS)
+.if ${OPSYS} == "SunOS"
 MAKE_ENV+=	NETBSD_COMPATIBLE=YES
 MANINSTALL=
 .endif
diff --git a/pkgtools/digest/files/Makefile b/pkgtools/digest/files/Makefile
index dec9ebd56ba..585d113d2d2 100644
--- a/pkgtools/digest/files/Makefile
+++ b/pkgtools/digest/files/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2001/03/12 09:08:40 agc Exp $
+#	$NetBSD: Makefile,v 1.5 2001/03/26 12:57:32 agc Exp $
 
 # When adding new digest algorithms, please use rmd160 as the template,
 # and bump the version definition in the package Makefile
@@ -12,9 +12,7 @@ WARNS= 2
 SRCS+= rmd160.c rmd160hl.c
 .endif
 
-.if !exists(/usr/include/sha1.h)
 SRCS+= sha1.c sha1hl.c
-.endif
 
 .if !exists(/usr/include/sha2.h)
 SRCS+= sha2.c sha2hl.c
diff --git a/pkgtools/digest/files/sha1.c b/pkgtools/digest/files/sha1.c
index 1aa01118555..d77071c442c 100644
--- a/pkgtools/digest/files/sha1.c
+++ b/pkgtools/digest/files/sha1.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sha1.c,v 1.2 2001/03/22 09:51:48 agc Exp $	*/
+/*	$NetBSD: sha1.c,v 1.3 2001/03/26 12:57:32 agc Exp $	*/
 /*	$OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $	*/
 
 /*
@@ -67,7 +67,7 @@
 #define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
 
 
-#if !defined(_KERNEL) && defined(__weak_alias)
+#if 0
 __weak_alias(SHA1Transform,_SHA1Transform)
 __weak_alias(SHA1Init,_SHA1Init)
 __weak_alias(SHA1Update,_SHA1Update)
diff --git a/pkgtools/digest/files/sha1hl.c b/pkgtools/digest/files/sha1hl.c
index 401ba524295..9e78bd6dbba 100644
--- a/pkgtools/digest/files/sha1hl.c
+++ b/pkgtools/digest/files/sha1hl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sha1hl.c,v 1.2 2001/03/10 15:55:14 tron Exp $	*/
+/*	$NetBSD: sha1hl.c,v 1.3 2001/03/26 12:57:32 agc Exp $	*/
 
 /* sha1hl.c
  * ----------------------------------------------------------------------------
@@ -25,14 +25,14 @@
 #include <unistd.h>
 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sha1hl.c,v 1.2 2001/03/10 15:55:14 tron Exp $");
+__RCSID("$NetBSD: sha1hl.c,v 1.3 2001/03/26 12:57:32 agc Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #ifndef _DIAGASSERT
 #define _DIAGASSERT(cond)	assert(cond)
 #endif
 
-#if defined(__weak_alias)
+#if 0
 __weak_alias(SHA1End,_SHA1End)
 __weak_alias(SHA1File,_SHA1File)
 __weak_alias(SHA1Data,_SHA1Data)