svn commit: r314146 - in stable/10/sys/modules: crypto geom/geom_bde random zfs

[Andriy Gapon]

Author: avg
Date: Thu Feb 23 16:15:42 2017
New Revision: 314146
URL: https://svnweb.freebsd.org/changeset/base/314146

Log:
  MFC r263219: add sha256c.c to the various modules that included sha2.c...

Modified:
  stable/10/sys/modules/crypto/Makefile
  stable/10/sys/modules/geom/geom_bde/Makefile
  stable/10/sys/modules/random/Makefile
  stable/10/sys/modules/zfs/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/modules/crypto/Makefile
==============================================================================
--- stable/10/sys/modules/crypto/Makefile	Thu Feb 23 16:10:15 2017	(r314145)
+++ stable/10/sys/modules/crypto/Makefile	Thu Feb 23 16:15:42 2017	(r314146)
@@ -14,7 +14,7 @@ SRCS	+= criov.c cryptosoft.c xform.c
 SRCS	+= cast.c cryptodeflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c
 SRCS	+= skipjack.c bf_enc.c bf_ecb.c bf_skey.c
 SRCS	+= des_ecb.c des_enc.c des_setkey.c
-SRCS	+= sha1.c sha2.c
+SRCS	+= sha1.c sha2.c sha256c.c
 SRCS	+= opt_param.h cryptodev_if.h bus_if.h device_if.h
 SRCS	+= opt_ddb.h opt_kdtrace.h
 SRCS	+= camellia.c camellia-api.c

Modified: stable/10/sys/modules/geom/geom_bde/Makefile
==============================================================================
--- stable/10/sys/modules/geom/geom_bde/Makefile	Thu Feb 23 16:10:15 2017	(r314145)
+++ stable/10/sys/modules/geom/geom_bde/Makefile	Thu Feb 23 16:15:42 2017	(r314146)
@@ -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: stable/10/sys/modules/random/Makefile
==============================================================================
--- stable/10/sys/modules/random/Makefile	Thu Feb 23 16:10:15 2017	(r314145)
+++ stable/10/sys/modules/random/Makefile	Thu Feb 23 16:15:42 2017	(r314146)
@@ -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: stable/10/sys/modules/zfs/Makefile
==============================================================================
--- stable/10/sys/modules/zfs/Makefile	Thu Feb 23 16:10:15 2017	(r314145)
+++ stable/10/sys/modules/zfs/Makefile	Thu Feb 23 16:15:42 2017	(r314146)
@@ -72,7 +72,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"