svn commit: r263219 - in head/sys/modules: crypto geom/geom_bde random zfs

[John-Mark Gurney]

Author: jmg
Date: Sun Mar 16 01:55:30 2014
New Revision: 263219
URL: http://svnweb.freebsd.org/changeset/base/263219

Log:
  I clearly didn't test the modules...  add sha256c.c to the various
  modules that included sha2.c...

Modified:
  head/sys/modules/crypto/Makefile
  head/sys/modules/geom/geom_bde/Makefile
  head/sys/modules/random/Makefile
  head/sys/modules/zfs/Makefile

Modified: head/sys/modules/crypto/Makefile
==============================================================================
--- head/sys/modules/crypto/Makefile	Sun Mar 16 01:43:23 2014	(r263218)
+++ head/sys/modules/crypto/Makefile	Sun Mar 16 01:55:30 2014	(r263219)
@@ -16,7 +16,7 @@ SRCS	+= cast.c cryptodeflate.c rmd160.c 
 SRCS	+= skipjack.c bf_enc.c bf_ecb.c bf_skey.c
 SRCS	+= camellia.c camellia-api.c
 SRCS	+= des_ecb.c des_enc.c des_setkey.c
-SRCS	+= sha1.c sha2.c
+SRCS	+= sha1.c sha2.c sha256c.c
 SRCS	+= siphash.c
 SRCS	+= opt_param.h cryptodev_if.h bus_if.h device_if.h
 SRCS	+= opt_ddb.h

Modified: head/sys/modules/geom/geom_bde/Makefile
==============================================================================
--- head/sys/modules/geom/geom_bde/Makefile	Sun Mar 16 01:43:23 2014	(r263218)
+++ head/sys/modules/geom/geom_bde/Makefile	Sun Mar 16 01:55:30 2014	(r263219)
@@ -6,6 +6,6 @@
 
 KMOD=	geom_bde
 SRCS=	g_bde.c g_bde_crypt.c g_bde_lock.c g_bde_work.c
-SRCS+=	rijndael-alg-fst.c rijndael-api-fst.c sha2.c
+SRCS+=	rijndael-alg-fst.c rijndael-api-fst.c sha2.c sha256c.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/random/Makefile
==============================================================================
--- head/sys/modules/random/Makefile	Sun Mar 16 01:43:23 2014	(r263218)
+++ head/sys/modules/random/Makefile	Sun Mar 16 01:55:30 2014	(r263219)
@@ -12,7 +12,7 @@ SRCS+=	ivy.c
 .endif
 SRCS+=	randomdev_soft.c yarrow.c hash.c
 SRCS+=	random_harvestq.c live_entropy_sources.c rwfile.c
-SRCS+=	rijndael-alg-fst.c rijndael-api-fst.c sha2.c
+SRCS+=	rijndael-alg-fst.c rijndael-api-fst.c sha2.c sha256c.c
 SRCS+=	bus_if.h device_if.h vnode_if.h opt_cpu.h opt_random.h
 
 CFLAGS+= -I${.CURDIR}/../..

Modified: head/sys/modules/zfs/Makefile
==============================================================================
--- head/sys/modules/zfs/Makefile	Sun Mar 16 01:43:23 2014	(r263218)
+++ head/sys/modules/zfs/Makefile	Sun Mar 16 01:55:30 2014	(r263219)
@@ -65,7 +65,7 @@ SRCS+=	zmod_subr.c
 SRCS+=	zutil.c
 
 .PATH:	${.CURDIR}/../../crypto/sha2
-SRCS+=	sha2.c
+SRCS+=	sha2.c sha256c.c
 
 .PATH:	${SUNW}/common/zfs
 .include "${SUNW}/uts/common/Makefile.files"