From 226eae7bc3cb9f4022947995aa0e34c5a628a169 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 22 Mar 2022 09:46:43 +0100 Subject: [PATCH] sys-fs/cryptsetup: sync with ::gentoo this pulls fips support. Commit-Ref: https://github.com/gentoo/gentoo/commit/1746c2caf877e7b678a5028ecff4bfcfb8899ff1 Signed-off-by: Mathieu Tortuyaux --- .../sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild | 5 +++-- .../portage-stable/sys-fs/cryptsetup/metadata.xml | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild index 8287adbcac..f2ac3491ef 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild @@ -16,10 +16,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" # we don't support nss since it doesn't allow cryptsetup to be built statically # and it's missing ripemd160 support so it can't provide full backward compatibility -IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static static-libs test +udev urandom" +IUSE="${CRYPTO_BACKENDS} +argon2 fips nls pwquality reencrypt ssh static static-libs test +udev urandom" RESTRICT="!test? ( test )" REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) - static? ( !gcrypt !ssh !udev )" # 496612, 832711 + static? ( !gcrypt !ssh !udev !fips )" # 496612, 832711 LIB_DEPEND=" dev-libs/json-c:=[static-libs(+)] @@ -91,6 +91,7 @@ src_configure() { $(use_enable !urandom dev-random) $(use_enable ssh ssh-token) $(usex argon2 '' '--with-luks2-pbkdf=pbkdf2') + $(use_enable fips) ) econf "${myeconfargs[@]}" } diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/metadata.xml index 7ecc557fd2..5f7443faf4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-fs/cryptsetup/metadata.xml @@ -7,6 +7,7 @@ Enable password hashing algorithm from app-crypt/argon2 + Enable FIPS mode restrictions Use dev-libs/libgcrypt crypto backend Use kernel crypto backend (mainly for embedded systems) Use dev-libs/nettle crypto backend