Index: stable/10/sys/modules/crypto/Makefile
===================================================================
--- stable/10/sys/modules/crypto/Makefile	(revision 314145)
+++ stable/10/sys/modules/crypto/Makefile	(revision 314146)
@@ -1,21 +1,21 @@
 # $FreeBSD$
 
 .PATH:	${.CURDIR}/../../opencrypto
 .PATH:	${.CURDIR}/../../crypto
 .PATH:	${.CURDIR}/../../crypto/blowfish
 .PATH:	${.CURDIR}/../../crypto/des
 .PATH:	${.CURDIR}/../../crypto/rijndael
 .PATH:	${.CURDIR}/../../crypto/sha2
 .PATH:	${.CURDIR}/../../crypto/camellia
 
 KMOD	= crypto
 SRCS	= crypto.c cryptodev_if.c
 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
 .include <bsd.kmod.mk>
Index: stable/10/sys/modules/geom/geom_bde/Makefile
===================================================================
--- stable/10/sys/modules/geom/geom_bde/Makefile	(revision 314145)
+++ stable/10/sys/modules/geom/geom_bde/Makefile	(revision 314146)
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../geom/bde
 .PATH: ${.CURDIR}/../../../crypto/rijndael
 .PATH: ${.CURDIR}/../../../crypto/sha2
 
 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>
Index: stable/10/sys/modules/random/Makefile
===================================================================
--- stable/10/sys/modules/random/Makefile	(revision 314145)
+++ stable/10/sys/modules/random/Makefile	(revision 314146)
@@ -1,20 +1,20 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../dev/random
 .PATH: ${.CURDIR}/../../crypto/rijndael
 .PATH: ${.CURDIR}/../../crypto/sha2
 
 KMOD=	random
 SRCS=	randomdev.c
 .if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
 SRCS+=	nehemiah.c
 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}/../..
 
 .include <bsd.kmod.mk>
Index: stable/10/sys/modules/zfs/Makefile
===================================================================
--- stable/10/sys/modules/zfs/Makefile	(revision 314145)
+++ stable/10/sys/modules/zfs/Makefile	(revision 314146)
@@ -1,120 +1,120 @@
 # $FreeBSD$
 
 KMOD=	zfs
 
 SRCS=	bus_if.h device_if.h vnode_if.h opt_kstack_pages.h
 
 .if !defined(KERNBUILDDIR)
 SRCS+=	opt_kdtrace.h
 opt_kdtrace.h:
 	echo "" > ${.TARGET}
 .endif
 
 SUNW=	${.CURDIR}/../../cddl/contrib/opensolaris
 
 .PATH:	${SUNW}/common/acl
 SRCS+=	acl_common.c
 .PATH:	${SUNW}/common/avl
 SRCS+=	avl.c
 .PATH:	${SUNW}/common/nvpair
 SRCS+=	opensolaris_nvpair.c
 SRCS+=	opensolaris_nvpair_alloc_fixed.c
 SRCS+=	opensolaris_fnvpair.c
 .PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/common/unicode
 SRCS+=	u8_textprep.c
 
 .PATH:	${.CURDIR}/../../cddl/compat/opensolaris/kern
 SRCS+=	opensolaris_acl.c
 SRCS+=	opensolaris_dtrace.c
 SRCS+=	opensolaris_kobj.c
 SRCS+=	opensolaris_kstat.c
 SRCS+=	opensolaris_lookup.c
 SRCS+=	opensolaris_policy.c
 SRCS+=	opensolaris_string.c
 SRCS+=	opensolaris_sysevent.c
 SRCS+=	opensolaris_taskq.c
 SRCS+=	opensolaris_uio.c
 SRCS+=	opensolaris_vfs.c
 SRCS+=	opensolaris_vm.c
 SRCS+=	opensolaris_zone.c
 
 _A=${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic
 .if exists(${_A}/${MACHINE_CPUARCH}/opensolaris_atomic.S)
 .PATH:	${_A}/${MACHINE_CPUARCH}
 SRCS+=		opensolaris_atomic.S
 .elif exists(${_A}/${MACHINE_ARCH}/opensolaris_atomic.S)
 .PATH:	${_A}/${MACHINE_ARCH}
 SRCS+=		opensolaris_atomic.S
 .else
 SRCS+=		opensolaris_atomic.c
 .endif
 
 .PATH:	${SUNW}/uts/common/fs
 SRCS+=	gfs.c
 SRCS+=	vnode.c
 
 .PATH:	${SUNW}/uts/common/os
 SRCS+=	callb.c
 SRCS+=	fm.c
 SRCS+=	list.c
 SRCS+=	nvpair_alloc_system.c
 
 .PATH:	${SUNW}/uts/common/zmod
 SRCS+=	adler32.c
 SRCS+=	opensolaris_crc32.c
 SRCS+=	deflate.c
 SRCS+=	inffast.c
 SRCS+=	inflate.c
 SRCS+=	inftrees.c
 SRCS+=	trees.c
 SRCS+=	zmod.c
 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"
 .PATH:	${SUNW}/uts/common/fs/zfs
 ZFS_SRCS=	${ZFS_OBJS:C/.o$/.c/}
 SRCS+=	${ZFS_SRCS}
 SRCS+=	vdev_geom.c
 SRCS+=	trim_map.c
 
 # Use FreeBSD's namecache.
 CFLAGS+=-DFREEBSD_NAMECACHE
 
 CFLAGS+=-I${.CURDIR}/../../cddl/compat/opensolaris
 CFLAGS+=-I${SUNW}/uts/common/fs/zfs
 CFLAGS+=-I${SUNW}/uts/common/zmod
 CFLAGS+=-I${SUNW}/uts/common
 CFLAGS+=-I${.CURDIR}/../..
 CFLAGS+=-I${SUNW}/common/zfs
 CFLAGS+=-I${SUNW}/common
 CFLAGS+=-DBUILDING_ZFS
 
 .if ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=-mminimal-toc
 .endif
 
 #CFLAGS+=-DDEBUG=1
 #DEBUG_FLAGS=-g
 
 .include <bsd.kmod.mk>
 
 CFLAGS+=	-include ${.CURDIR}/../../cddl/compat/opensolaris/sys/debug_compat.h
 
 CWARNFLAGS+=-Wno-unknown-pragmas
 CWARNFLAGS+=-Wno-missing-prototypes
 CWARNFLAGS+=-Wno-undef
 CWARNFLAGS+=-Wno-strict-prototypes
 CWARNFLAGS+=-Wno-cast-qual
 CWARNFLAGS+=-Wno-parentheses
 CWARNFLAGS+=-Wno-redundant-decls
 CWARNFLAGS+=-Wno-missing-braces
 CWARNFLAGS+=-Wno-uninitialized
 CWARNFLAGS+=-Wno-unused
 CWARNFLAGS+=-Wno-inline
 CWARNFLAGS+=-Wno-switch
 CWARNFLAGS+=-Wno-pointer-arith
Index: stable/10
===================================================================
--- stable/10	(revision 314145)
+++ stable/10	(revision 314146)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r263219