From patchwork Wed Apr 8 07:55:40 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kate Hsuan X-Patchwork-Id: 26501 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 73F32BDCBD for ; Wed, 8 Apr 2026 07:56:40 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1F8F862DD3; Wed, 8 Apr 2026 09:56:40 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="gHJuV6Kt"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B6AD362DB7 for ; Wed, 8 Apr 2026 09:56:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1775634997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zR3E2P0FfHLaNh+kZBSbcg+8eM35S78nVWlxvV9aViM=; b=gHJuV6Ktd9IoDpGeH3cJ6pq5R1XYexO6ADiHBI6pREgBVc4Fbb6GQAqMxrvp+jpaj+tc7g QPg9IOBvnLZpyGtvS2EFZH+jjeV4uoKpFFZl83PoOE9634+puz/rWvZi62QdbP2VjsIGPg MltaNu8pMwllZysDm+/jnhEgeCiVHQA= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-300-tTIq0DV8OTCCZbpFEmlzhg-1; Wed, 08 Apr 2026 03:56:36 -0400 X-MC-Unique: tTIq0DV8OTCCZbpFEmlzhg-1 X-Mimecast-MFC-AGG-ID: tTIq0DV8OTCCZbpFEmlzhg_1775634995 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6B2CC1956089 for ; Wed, 8 Apr 2026 07:56:35 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.67.32.15]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B1DAB300019F; Wed, 8 Apr 2026 07:56:33 +0000 (UTC) From: Kate Hsuan To: libcamera-devel@lists.libcamera.org Cc: Kate Hsuan Subject: [PATCH 4/4] meson: Add "fips" meson option to enable ML-DSA Date: Wed, 8 Apr 2026 15:55:40 +0800 Message-ID: <20260408075540.53309-5-hpa@redhat.com> In-Reply-To: <20260408075540.53309-1-hpa@redhat.com> References: <20260408075540.53309-1-hpa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: g973dwkU6IvoTWAA_Ddc3VM75SkLmQl4SnAc5cS_WwE_1775634995 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a boolean type "fips" meson option to enable ML-SDA. If fips=false, the RSA-SHA256 will be used. Signed-off-by: Kate Hsuan --- meson_options.txt | 5 +++++ src/libcamera/meson.build | 6 ++++++ src/meson.build | 13 ++++++++++--- utils/gen-ipa-priv-key.sh | 16 ++++++++++++++-- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index c27e377a..c89167fb 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -26,6 +26,11 @@ option('doc_werror', value : false, description : 'Treat documentation warnings as errors') +option('fips', + type : 'boolean', + value : false, + description : 'Sign IPA library using ML-DSA (FIPS 204)') + option('gstreamer', type : 'feature', value : 'auto', diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index d1594358..aed962c4 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -118,6 +118,12 @@ else endif endif +# comply with FIPS 204 +with_fips = get_option('fips') +if with_fips + config_h.set('WITH_FIPS', 1) +endif + if not libcrypto.found() warning('Neither gnutls nor libcrypto found, all IPA modules will be isolated') summary({'IPA modules signed with': 'None (modules will run isolated)'}, diff --git a/src/meson.build b/src/meson.build index 9b63c8e8..f1493341 100644 --- a/src/meson.build +++ b/src/meson.build @@ -15,11 +15,18 @@ summary({ }, section : 'Paths') # Module Signing +with_fips = get_option('fips') openssl = find_program('openssl', required : false) if openssl.found() - ipa_priv_key = custom_target('ipa-priv-key', - output : ['ipa-priv-key.pem'], - command : [gen_ipa_priv_key, '@OUTPUT@']) + if with_fips + ipa_priv_key = custom_target('ipa-priv-key', + output : ['ipa-priv-key.pem'], + command : [gen_ipa_priv_key, 'ML-DSA-65', '@OUTPUT@']) + else + ipa_priv_key = custom_target('ipa-priv-key', + output : ['ipa-priv-key.pem'], + command : [gen_ipa_priv_key, 'RSA', '@OUTPUT@']) + endif config_h.set('HAVE_IPA_PUBKEY', 1) ipa_sign_module = true else diff --git a/utils/gen-ipa-priv-key.sh b/utils/gen-ipa-priv-key.sh index 2ca7b883..374377fc 100755 --- a/utils/gen-ipa-priv-key.sh +++ b/utils/gen-ipa-priv-key.sh @@ -6,6 +6,18 @@ # # Generate an RSA private key to sign IPA modules -key="$1" +algo="$1" +key="$2" -openssl genpkey -algorithm RSA -out "${key}" -pkeyopt rsa_keygen_bits:2048 +# Two possible algorithms: RSA and ML-DSA-65 +# openssl genpkey -algorithm RSA -out "${key}" -pkeyopt rsa_keygen_bits:2048 +# openssl genpkey -algorithm ML-DSA-65 -out "${key}" + +if [ "$algo" == "RSA" ]; then + openssl genpkey -algorithm RSA -out "${key}" -pkeyopt rsa_keygen_bits:2048 +elif [ "$algo" == "ML-DSA-65" ]; then + openssl genpkey -algorithm ML-DSA-65 -out "${key}" +else + echo "Invalid algorithm: $algo" + exit 1 +fi \ No newline at end of file