summaryrefslogtreecommitdiffstats
path: root/sys/modules
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2017-02-27 08:27:38 +0000
committeravg <avg@FreeBSD.org>2017-02-27 08:27:38 +0000
commitc08ec0f7fd214080e3d49c30f69793dd060b2d13 (patch)
tree7dc7f03824fc55a11bb932a418d8ede77ccfc6f8 /sys/modules
parentbe0c71b7c23b2e474cb28e2df13ea927c2c3b2f0 (diff)
downloadFreeBSD-src-c08ec0f7fd214080e3d49c30f69793dd060b2d13.zip
FreeBSD-src-c08ec0f7fd214080e3d49c30f69793dd060b2d13.tar.gz
MFC r292782: Replace sys/crypto/sha2/sha2.c with lib/libmd/sha512c.c
cperciva's libmd implementation is 5-30% faster The same was done for SHA256 previously in r263218 Approved by: secteam
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/crypto/Makefile2
-rw-r--r--sys/modules/geom/geom_bde/Makefile2
-rw-r--r--sys/modules/zfs/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile
index 8ac7481..9dfc157 100644
--- a/sys/modules/crypto/Makefile
+++ b/sys/modules/crypto/Makefile
@@ -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 sha256c.c
+SRCS += sha1.c sha256c.c sha512c.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
diff --git a/sys/modules/geom/geom_bde/Makefile b/sys/modules/geom/geom_bde/Makefile
index 5c5a590..bcb4dbc 100644
--- a/sys/modules/geom/geom_bde/Makefile
+++ b/sys/modules/geom/geom_bde/Makefile
@@ -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 sha256c.c
+SRCS+= rijndael-alg-fst.c rijndael-api-fst.c sha256c.c sha512c.c
.include <bsd.kmod.mk>
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index 230cb58..58d1cbb 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -72,7 +72,7 @@ SRCS+= zmod_subr.c
SRCS+= zutil.c
.PATH: ${.CURDIR}/../../crypto/sha2
-SRCS+= sha2.c sha256c.c
+SRCS+= sha256c.c sha512c.c
.PATH: ${SUNW}/common/zfs
.include "${SUNW}/uts/common/Makefile.files"
OpenPOWER on IntegriCloud