From nobody Mon Jan 24 23:29:08 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 63E8E1986368; Mon, 24 Jan 2022 23:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JjR5K0TWhz4gvv; Mon, 24 Jan 2022 23:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643066949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jKmCiyfJUFMki6Q57n88AlTZmPjkn+ouGL2UM0ctkkY=; b=As9h0VtytPvD2iuegJ3Om3z2E9jeeAr6X8s5fKzhdHHGHwtLaeBUrow31QD9cw/Ag13bRi +HlBHFToL0sKfJNKxMqlXGac2WhgmQeGJ7UoRaA+jpHXKYzPJgXs3u58jJ8SovNT52KMiM vLKnnYExZBzXYTwR8TKVG1cgBuZO0xUKxdSloU9RetAJgrlh7BOGGZM899PCrNNS7RYqIO pGDyvhCTrZDK0Kxt7jKwXCIHKxx0DIsY9zVujSo8eqK2NLFB63PIk9EXWbpXpmloOxUnNb chRGCqcgH/aJiZRUg6iKOvFyOiTpNXIoX5pevOPkvZwm7gEGZxD+bifrW3AIqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D0B3A1ECBD; Mon, 24 Jan 2022 23:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20ONT8BJ069353; Mon, 24 Jan 2022 23:29:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20ONT8er069352; Mon, 24 Jan 2022 23:29:08 GMT (envelope-from git) Date: Mon, 24 Jan 2022 23:29:08 GMT Message-Id: <202201242329.20ONT8er069352@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 1d95c6f9c0f2 - main - Don't implicitly pull in most of 'device crypto' for 'options IPSEC'. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d95c6f9c0f20ac287c50e0d31e909b35f28a05f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643066949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jKmCiyfJUFMki6Q57n88AlTZmPjkn+ouGL2UM0ctkkY=; b=rpVQaI9QEU+1EYcZQO2GRlALDcA8M70h0oKKXGy1mB4tQsy+Y0N2HyZ1wCb1L7kRm0dkYh 7G1kYce5wVB9lMSTJjvumT7Qs9cXtl8Tmcq1W28brmUbLwSVVvz56G08VsWjSGTXJGMHhO NnDrjMP1oA4Al0NtiECi5YMH6sa+Sv1Er0xUBXTwAin4rvKMUgGCfZlxaiNd+ntHsjL1lI sIzUQzr9ugJ78FEjpkud1f8jci//lkZsCTJftS5lHASue01O9dm0G3eWw8DGJp5p8RhmuC Ra89kC5JsqN/nhw/hM2aqejMN3snk8ApCMLcXMYMga7n8M+QXvo2V07OQHHSIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643066949; a=rsa-sha256; cv=none; b=p6KA2MprdNV2wkKZRm8VL8m37iZOthhfLoLE9f8VLSjs0XTJUp+Tg5ngoKqEBg/WiLvfkC 3w39ZKRjbR9FsG5uFGuIKZRTWZ9GVpZTzqbJ995QhwvqbttMouXaI35TCCbsnzrq4spFl+ PAOouUHyhy0UQDaZIV2YVHAqY0VCkMvCdyBTzbUvOg2Ka/ripRJnb4WUscZz//YWU0kDxd ubWGA65W9JM10pJzNhaoyiY44wp/idG4brlXs66fyMcewgh1xv+a3fCe2DQR5esYB3vpx0 7KugQ4O3GwhfWAcwsFQEgdd6wagmma/6zg0/LNNmxv2O+ieQVdjF0G8rbj5jsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1d95c6f9c0f20ac287c50e0d31e909b35f28a05f commit 1d95c6f9c0f20ac287c50e0d31e909b35f28a05f Author: John Baldwin AuthorDate: 2022-01-24 23:27:39 +0000 Commit: John Baldwin CommitDate: 2022-01-24 23:27:39 +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 --- sys/conf/files | 94 ++++++++++++++++++++++++++++------------------------------ 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index fec643119e47..01b08594dc97 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -704,16 +704,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} # 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/chacha20_poly1305.c optional crypto crypto/curve25519.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" @@ -728,16 +728,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 @@ -4074,33 +4072,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 @@ -4935,17 +4933,17 @@ 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/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/ktls_ocf.c optional kern_tls -opencrypto/rmd160.c optional crypto | ipsec | ipsec_support -opencrypto/xform.c optional crypto | ipsec | ipsec_support +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"