diff options
author | allanjude <allanjude@FreeBSD.org> | 2015-12-27 17:33:59 +0000 |
---|---|---|
committer | allanjude <allanjude@FreeBSD.org> | 2015-12-27 17:33:59 +0000 |
commit | c7c2f2dfabee24fac29d13375d8c29a7f766746c (patch) | |
tree | 8a9bc5399c16c0f637716b176f3f95c32c001a0f /sys/modules | |
parent | e7bdbef72941799b684fb8a542f52b0fbafd254d (diff) | |
download | FreeBSD-src-c7c2f2dfabee24fac29d13375d8c29a7f766746c.zip FreeBSD-src-c7c2f2dfabee24fac29d13375d8c29a7f766746c.tar.gz |
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
cperciva's implementation was lacking SHA-384 which I implemented, validated against OpenSSL and the NIST documentation
Extend sbin/md5 to create sha384(1)
Chase dependancies on sys/crypto/sha2/sha2.{c,h} and replace them with sha512{c.c,.h}
Reviewed by: cperciva, des, delphij
Approved by: secteam, bapt (mentor)
MFC after: 2 weeks
Sponsored by: ScaleEngine Inc.
Differential Revision: https://reviews.freebsd.org/D3929
Diffstat (limited to 'sys/modules')
-rw-r--r-- | sys/modules/crypto/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/geom/geom_bde/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/zfs/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile index 4506cb3..b476571 100644 --- a/sys/modules/crypto/Makefile +++ b/sys/modules/crypto/Makefile @@ -16,7 +16,7 @@ SRCS += cast.c cryptodeflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c rijnda 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 sha256c.c +SRCS += sha1.c sha256c.c sha512c.c SRCS += siphash.c SRCS += gmac.c gfmult.c SRCS += opt_param.h cryptodev_if.h bus_if.h device_if.h 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 ffbd9ba..a824422 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -68,7 +68,7 @@ SRCS+= zmod_subr.c SRCS+= zutil.c .PATH: ${SYSDIR}/crypto/sha2 -SRCS+= sha2.c sha256c.c +SRCS+= sha256c.c sha512c.c .PATH: ${SUNW}/common/zfs .include "${SUNW}/uts/common/Makefile.files" |