From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1378359-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 1B0B815808B
for <garchives@archives.gentoo.org>; Mon, 21 Mar 2022 23:48:29 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 54B19E0924;
Mon, 21 Mar 2022 23:48:27 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A9C9BE08EB
for <gentoo-commits@lists.gentoo.org>; Mon, 21 Mar 2022 23:48:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9BC39343055
for <gentoo-commits@lists.gentoo.org>; Mon, 21 Mar 2022 23:48:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3777D177
for <gentoo-commits@lists.gentoo.org>; Mon, 21 Mar 2022 23:48:24 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1647906281.5ec57a0b4c6249bafb46fb7041430cc9b53e2372.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild sys-fs/cryptsetup/metadata.xml
X-VCS-Directories: sys-fs/cryptsetup/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 5ec57a0b4c6249bafb46fb7041430cc9b53e2372
X-VCS-Branch: master
Date: Mon, 21 Mar 2022 23:48:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6905d1e9-eb3f-44ac-9c3f-7f7fb45eab57
X-Archives-Hash: 90236b32285165214aec104a229018e5
commit: 5ec57a0b4c6249bafb46fb7041430cc9b53e2372
Author: Mathieu Tortuyaux <mtortuyaux <AT> microsoft <DOT> com>
AuthorDate: Thu Mar 10 14:27:13 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 23:44:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ec57a0b
sys-fs/cryptsetup: add fips useflag
Closes: https://bugs.gentoo.org/834920
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mathieu Tortuyaux <mtortuyaux <AT> microsoft.com>
Closes: https://github.com/gentoo/gentoo/pull/24479
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild | 5 +++--
sys-fs/cryptsetup/metadata.xml | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
index 8287adbcacaf..f2ac3491ef69 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild
+++ b/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/sys-fs/cryptsetup/metadata.xml b/sys-fs/cryptsetup/metadata.xml
index 7ecc557fd2b4..5f7443faf40f 100644
--- a/sys-fs/cryptsetup/metadata.xml
+++ b/sys-fs/cryptsetup/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="argon2">Enable password hashing algorithm from <pkg>app-crypt/argon2</pkg></flag>
+ <flag name="fips">Enable FIPS mode restrictions</flag>
<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> crypto backend</flag>
<flag name="kernel">Use kernel crypto backend (mainly for embedded systems)</flag>
<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> crypto backend</flag>