diff options
| author | Xin LI <delphij@FreeBSD.org> | 2019-08-01 06:35:33 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2019-08-01 06:35:33 +0000 |
| commit | 0ed1d6fb00b8f22c82c3f9054c6dd16eb12469d2 (patch) | |
| tree | 8acee00d6eeed9533a5e78d99524a1e23e39ef11 /sys/modules/crypto | |
| parent | 0effb2ccf38a6844871370c0b6504c6ec8217252 (diff) | |
| download | src-0ed1d6fb00b8f22c82c3f9054c6dd16eb12469d2.tar.gz src-0ed1d6fb00b8f22c82c3f9054c6dd16eb12469d2.zip | |
Allow Kernel to link in both legacy libkern/zlib and new sys/contrib/zlib,
with an eventual goal to convert all legacl zlib callers to the new zlib
version:
* Move generic zlib shims that are not specific to zlib 1.0.4 to
sys/dev/zlib.
* Connect new zlib (1.2.11) to the zlib kernel module, currently built
with Z_SOLO.
* Prefix the legacy zlib (1.0.4) with 'zlib104_' namespace.
* Convert sys/opencrypto/cryptodeflate.c to use new zlib.
* Remove bundled zlib 1.2.3 from ZFS and adapt it to new zlib and make
it depend on the zlib module.
* Fix Z_SOLO build of new zlib.
PR: 229763
Submitted by: Yoshihiro Ota <ota j email ne jp>
Reviewed by: markm (sys/dev/zlib/zlib_kmod.c)
Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D19706
Notes
Notes:
svn path=/head/; revision=350496
Diffstat (limited to 'sys/modules/crypto')
| -rw-r--r-- | sys/modules/crypto/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile index 09c5d710e985..15e46057597f 100644 --- a/sys/modules/crypto/Makefile +++ b/sys/modules/crypto/Makefile @@ -23,6 +23,7 @@ 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 rijndael-api-fst.c +CFLAGS.cryptodeflate.c += ${ZLIB_CFLAGS} 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 |