Date: Wed, 13 Jul 2022 16:47:31 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 2473824a16eb - stable/13 - Don't implicitly pull in most of 'device crypto' for 'options IPSEC'. Message-ID: <202207131647.26DGlVpM052051@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2473824a16ebe7d6554a9f56698bc3c7acad1c67 commit 2473824a16ebe7d6554a9f56698bc3c7acad1c67 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-01-24 23:27:39 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-07-13 16:14:46 +0000 Don't implicitly pull in most of 'device crypto' for 'options IPSEC'. options IPSEC is already documented as requiring 'device crypto' and duplicating the dependencies is harder to read and not always consistent. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33990 (cherry picked from commit 1d95c6f9c0f20ac287c50e0d31e909b35f28a05f) --- sys/conf/files | 94 ++++++++++++++++++++++++++++------------------------------ 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 580428d3ad1c..57afd7c987b0 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -730,16 +730,16 @@ contrib/zstd/lib/decompress/zstd_decompress_block.c optional zstdio \ compile-with "${ZSTD_C} ${ZSTD_DECOMPRESS_BLOCK_FLAGS}" contrib/zstd/lib/decompress/huf_decompress.c optional zstdio compile-with "${ZSTD_C} ${NO_WBITWISE_INSTEAD_OF_LOGICAL}" # Blake 2 -contrib/libb2/blake2b-ref.c optional crypto | ipsec | ipsec_support | !random_loadable random_fenestrasx \ +contrib/libb2/blake2b-ref.c optional crypto | !random_loadable random_fenestrasx \ compile-with "${NORMAL_C} -I$S/crypto/blake2 -Wno-cast-qual -DSUFFIX=_ref -Wno-unused-function" -contrib/libb2/blake2s-ref.c optional crypto | ipsec | ipsec_support \ +contrib/libb2/blake2s-ref.c optional crypto \ compile-with "${NORMAL_C} -I$S/crypto/blake2 -Wno-cast-qual -DSUFFIX=_ref -Wno-unused-function" -crypto/blake2/blake2-sw.c optional crypto | ipsec | ipsec_support \ +crypto/blake2/blake2-sw.c optional crypto \ compile-with "${NORMAL_C} -I$S/crypto/blake2 -Wno-cast-qual" -crypto/camellia/camellia.c optional crypto | ipsec | ipsec_support -crypto/camellia/camellia-api.c optional crypto | ipsec | ipsec_support +crypto/camellia/camellia.c optional crypto +crypto/camellia/camellia-api.c optional crypto crypto/chacha20/chacha.c standard -crypto/chacha20/chacha-sw.c optional crypto | ipsec | ipsec_support +crypto/chacha20/chacha-sw.c optional crypto crypto/des/des_ecb.c optional netsmb crypto/des/des_setkey.c optional netsmb crypto/openssl/ossl.c optional ossl @@ -750,16 +750,14 @@ crypto/openssl/ossl_sha256.c optional ossl crypto/openssl/ossl_sha512.c optional ossl crypto/rc4/rc4.c optional netgraph_mppc_encryption crypto/rijndael/rijndael-alg-fst.c optional crypto | ekcd | geom_bde | \ - ipsec | ipsec_support | !random_loadable | wlan_ccmp + !random_loadable | wlan_ccmp crypto/rijndael/rijndael-api-fst.c optional ekcd | geom_bde | !random_loadable -crypto/rijndael/rijndael-api.c optional crypto | ipsec | ipsec_support | \ - wlan_ccmp -crypto/sha1.c optional carp | crypto | ether | ipsec | \ - ipsec_support | netgraph_mppc_encryption | sctp -crypto/sha2/sha256c.c optional crypto | ekcd | geom_bde | ipsec | \ - ipsec_support | !random_loadable | sctp | zfs -crypto/sha2/sha512c.c optional crypto | geom_bde | ipsec | \ - ipsec_support | zfs +crypto/rijndael/rijndael-api.c optional crypto | wlan_ccmp +crypto/sha1.c optional carp | crypto | ether | \ + netgraph_mppc_encryption | sctp +crypto/sha2/sha256c.c optional crypto | ekcd | geom_bde | \ + !random_loadable | sctp | zfs +crypto/sha2/sha512c.c optional crypto | geom_bde | zfs crypto/skein/skein.c optional crypto | zfs crypto/skein/skein_block.c optional crypto | zfs crypto/siphash/siphash.c optional inet | inet6 @@ -4126,33 +4124,33 @@ libkern/strtoul.c standard libkern/strtouq.c standard libkern/strvalid.c standard libkern/timingsafe_bcmp.c standard -contrib/zlib/adler32.c optional crypto | geom_uzip | ipsec | \ - ipsec_support | mxge | ddb_ctf | gzio | zfs | zlib -contrib/zlib/compress.c optional crypto | geom_uzip | ipsec | \ - ipsec_support | mxge | ddb_ctf | gzio | zfs | zlib \ +contrib/zlib/adler32.c optional crypto | geom_uzip | \ + mxge | ddb_ctf | gzio | zfs | zlib +contrib/zlib/compress.c optional crypto | geom_uzip | \ + mxge | ddb_ctf | gzio | zfs | zlib \ compile-with "${NORMAL_C} -Wno-cast-qual" -contrib/zlib/crc32.c optional crypto | geom_uzip | ipsec | \ - ipsec_support | mxge | ddb_ctf | gzio | zfs | zlib -contrib/zlib/deflate.c optional crypto | geom_uzip | ipsec | \ - ipsec_support | mxge | ddb_ctf | gzio | zfs | zlib \ +contrib/zlib/crc32.c optional crypto | geom_uzip | \ + mxge | ddb_ctf | gzio | zfs | zlib +contrib/zlib/deflate.c optional crypto | geom_uzip | \ + mxge | ddb_ctf | gzio | zfs | zlib \ compile-with "${NORMAL_C} -Wno-cast-qual" -contrib/zlib/inffast.c optional crypto | geom_uzip | ipsec | \ - ipsec_support | mxge | ddb_ctf | gzio | zfs | zlib -contrib/zlib/inflate.c optional crypto | geom_uzip | ipsec | \ - ipsec_support | mxge | ddb_ctf | gzio | zfs | zlib -contrib/zlib/inftrees.c optional crypto | geom_uzip | ipsec | \ - ipsec_support | mxge | ddb_ctf | gzio | zfs | zlib -contrib/zlib/trees.c optional crypto | geom_uzip | ipsec | \ - ipsec_support | mxge | ddb_ctf | gzio | zfs | zlib -contrib/zlib/uncompr.c optional crypto | geom_uzip | ipsec | \ - ipsec_support | mxge | ddb_ctf | gzio | zfs | zlib \ +contrib/zlib/inffast.c optional crypto | geom_uzip | \ + mxge | ddb_ctf | gzio | zfs | zlib +contrib/zlib/inflate.c optional crypto | geom_uzip | \ + mxge | ddb_ctf | gzio | zfs | zlib +contrib/zlib/inftrees.c optional crypto | geom_uzip | \ + mxge | ddb_ctf | gzio | zfs | zlib +contrib/zlib/trees.c optional crypto | geom_uzip | \ + mxge | ddb_ctf | gzio | zfs | zlib +contrib/zlib/uncompr.c optional crypto | geom_uzip | \ + mxge | ddb_ctf | gzio | zfs | zlib \ compile-with "${NORMAL_C} -Wno-cast-qual" -contrib/zlib/zutil.c optional crypto | geom_uzip | ipsec | \ - ipsec_support | mxge | ddb_ctf | gzio | zfs | zlib -dev/zlib/zlib_mod.c optional crypto | geom_uzip | ipsec | \ - ipsec_support | mxge | ddb_ctf | gzio | zfs | zlib -dev/zlib/zcalloc.c optional crypto | geom_uzip | ipsec | \ - ipsec_support | mxge | ddb_ctf | gzio | zfs | zlib +contrib/zlib/zutil.c optional crypto | geom_uzip | \ + mxge | ddb_ctf | gzio | zfs | zlib +dev/zlib/zlib_mod.c optional crypto | geom_uzip | \ + mxge | ddb_ctf | gzio | zfs | zlib +dev/zlib/zcalloc.c optional crypto | geom_uzip | \ + mxge | ddb_ctf | gzio | zfs | zlib net/altq/altq_cbq.c optional altq net/altq/altq_codel.c optional altq net/altq/altq_hfsc.c optional altq @@ -4964,16 +4962,16 @@ dev/mlx5/mlx5_en/mlx5_en_port_buffer.c optional mlx5en pci inet inet6 \ # crypto support opencrypto/cbc_mac.c optional crypto -opencrypto/criov.c optional crypto | ipsec | ipsec_support -opencrypto/crypto.c optional crypto | ipsec | ipsec_support +opencrypto/criov.c optional crypto +opencrypto/crypto.c optional crypto opencrypto/cryptodev.c optional cryptodev -opencrypto/cryptodev_if.m optional crypto | ipsec | ipsec_support -opencrypto/cryptosoft.c optional crypto | ipsec | ipsec_support -opencrypto/cryptodeflate.c optional crypto | ipsec | ipsec_support -opencrypto/gmac.c optional crypto | ipsec | ipsec_support -opencrypto/gfmult.c optional crypto | ipsec | ipsec_support -opencrypto/rmd160.c optional crypto | ipsec | ipsec_support -opencrypto/xform.c optional crypto | ipsec | ipsec_support +opencrypto/cryptodev_if.m optional crypto +opencrypto/cryptosoft.c optional crypto +opencrypto/cryptodeflate.c optional crypto +opencrypto/gmac.c optional crypto +opencrypto/gfmult.c optional crypto +opencrypto/rmd160.c optional crypto +opencrypto/xform.c optional crypto opencrypto/xform_cbc_mac.c optional crypto opencrypto/xform_chacha20_poly1305.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207131647.26DGlVpM052051>