From nobody Wed Jul 13 16:47:31 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 F414317FBEAA; Wed, 13 Jul 2022 16:47:31 +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 4Ljk7R6DQgz3Vx9; Wed, 13 Jul 2022 16:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657730851; 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=OFA0ljPojsEX1JB4/8NAhgv3zX1v/iXZ4eAELpshLy0=; b=VvhVwSbxKNzfrAwMxolpChtJTNyblKj0YpNWtuM1N5YbefooAPTnt57WLjqLG5S85inKa7 SUB7VqXlFqlgrfHy2ZXinotVA8DNFIt4wFBJlSN1u7nuYV2JeALjDDaMKJJ3FdM+Ieputc 0Za78A7IBB1fGqNjWGhpZjHnBmGzx/UhLMDZ3d4KSV1kiicuEqnqUqZ533fNKyEYZ7cebc wxhncNBEXYg9xKd1I09T7kHRA/W6APUIA+gY/4C8mXp9Dm4BC2xllhbp7dxa8vuB1KvC6D 4n7iJFUKHqLTVxLUhlgnuDv4ONk+CCdRJ6ZqCf+EMVahJZIaATSqOahDKRC//A== 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 4Ljk7R5DS8zW3H; Wed, 13 Jul 2022 16:47:31 +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 26DGlVIx052052; Wed, 13 Jul 2022 16:47:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26DGlVpM052051; Wed, 13 Jul 2022 16:47:31 GMT (envelope-from git) Date: Wed, 13 Jul 2022 16:47:31 GMT Message-Id: <202207131647.26DGlVpM052051@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 2473824a16eb - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2473824a16ebe7d6554a9f56698bc3c7acad1c67 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657730851; 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=OFA0ljPojsEX1JB4/8NAhgv3zX1v/iXZ4eAELpshLy0=; b=et0l35VCIewzfGRNa713cHquEHsG81MtfMIGGWESSvD5VzwK9//mvMhkY7pEW/wFk6SAqG lXw1VU+3jZJNg3GGrWMz7Mw5frxKq5QJ8XjV+gcLDoYdfxdWihY94egrz9i33aubyBMgJ5 qXHa2wStUcdhZ5OSTw0MIGCkfO4rGuWIL/pqIUCVZWz+KvfZ7Xvgqen9zrwW27/ORatAYT r096h/m11ctkhn7RA25IZqQfBxLVxR3SyrZQV9o2UXlkWjNTcsMQlbnUSWsd/z0OhWMtpi /UTqfgQq9Wn42MGDHCbuz38zBqfN6bYcQtBbupfxPo9TRbCIUK0MdmjHlWHrwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657730851; a=rsa-sha256; cv=none; b=cU9U66277V+8ni2TINcoTxLvMYnt811Av+abgCfVm961ohUEmNVb0OiAaOuyBGH3VTekmD znBjQbCstrpEtDsLq5O9/3eX9tXKBYHDoiK8LdGto8F86gYzzZO3O17HHbplBIUPONnMWI fkMyhw2FcicFzmPHSbBIjzrtDoI3cnEHJwRvaMtgNQroz7pVP1mJ4c1U2c7j5y5PjXbsga UwlbaG9WSAILcbzjOAIBBR1kVzvPLBQK0jrvT40uTSlW49SxJeLPM8zU+9x60Uw+2ZfoPE 6RgoKp7Sf5pQGq1/C8TZXiM7oCCcj7B7545i7iQBt9ZQ6quKJFpvrsh6N4CpKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2473824a16ebe7d6554a9f56698bc3c7acad1c67 commit 2473824a16ebe7d6554a9f56698bc3c7acad1c67 Author: John Baldwin AuthorDate: 2022-01-24 23:27:39 +0000 Commit: John Baldwin 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"