From patchwork Wed Apr 22 04:47:36 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kate Hsuan X-Patchwork-Id: 26536 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 1E885BDCBD for ; Wed, 22 Apr 2026 04:48:18 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D510662EF7; Wed, 22 Apr 2026 06:48:17 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="iFciKQZZ"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9310B62EF7 for ; Wed, 22 Apr 2026 06:48:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776833294; 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=dUf+Wh8et3UJa0DjCN0pIiBnfbdNCIlmh9Mr66IL0OI=; b=iFciKQZZfAymF2yyNye0stS6BVJcNUnuz64lOftxolM7S4HWQX0qFS6QSVsMM6Uo/174OY ZT+CsxQ+96MQ2EALz5Etj3xR/zDKv5XJnL7jwNjBgZU3Dgf/W+pLxNgIFysxzhk2cGuEvJ m5ZoT7tJO/Y3JSZtxl/Tu63LhPCqam0= Received: from mx-prod-mc-03.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-341-qOSQIzzIMmuGmbagK1PBQw-1; Wed, 22 Apr 2026 00:48:10 -0400 X-MC-Unique: qOSQIzzIMmuGmbagK1PBQw-1 X-Mimecast-MFC-AGG-ID: qOSQIzzIMmuGmbagK1PBQw_1776833289 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0AE371956048; Wed, 22 Apr 2026 04:48:09 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.67.32.92]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BCABF19560B7; Wed, 22 Apr 2026 04:48:06 +0000 (UTC) From: Kate Hsuan To: libcamera-devel@lists.libcamera.org, =?utf-8?b?QmFybmFiw6FzIFDFkWN6?= =?utf-8?q?e?= Cc: Kate Hsuan Subject: [PATCH v2 4/4] meson: Add ipa-signature-algo option Date: Wed, 22 Apr 2026 12:47:36 +0800 Message-ID: <20260422044736.24717-5-hpa@redhat.com> In-Reply-To: <20260422044736.24717-1-hpa@redhat.com> References: <20260422044736.24717-1-hpa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 6cDFDei8vCTfjaffPSWgcJOu1rDxTbSslxighhJW24I_1776833289 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 combo type "ipa-signature-algo" meson option to select signature algorithms, including rsa-sha256 and ml-dsa-65. ras-sha256 is the default setting for now. Signed-off-by: Kate Hsuan --- meson_options.txt | 8 ++++++++ src/libcamera/meson.build | 6 ++++++ src/meson.build | 14 +++++++++++--- utils/gen-ipa-priv-key.sh | 16 ++++++++++++++-- 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index 20baacc4..18488e6b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -46,6 +46,14 @@ option('gstreamer', value : 'auto', description : 'Compile libcamera GStreamer plugin') +option('ipa-signature-algo', + type : 'combo', + choices : [ + 'rsa-sha256', + 'ml-dsa-65', + ], + description : 'Select a signature algorithm to sign IPA libraries.') + option('ipas', type : 'array', choices : ['ipu3', 'mali-c55', 'rkisp1', 'rpi/pisp', 'rpi/vc4', 'simple', diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 575408b2..55ba6c6d 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -97,6 +97,12 @@ else endif endif +# comply with FIPS 204 +signature_algo = get_option('ipa-signature-algo') +if signature_algo == 'ml-dsa-65' + config_h.set('WITH_PQC', 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..7f8909b1 100644 --- a/src/meson.build +++ b/src/meson.build @@ -15,11 +15,19 @@ summary({ }, section : 'Paths') # Module Signing +signature_algo = get_option('ipa-signature-algo') 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 signature_algo == 'ml-dsa-65' + ipa_priv_key = custom_target('ipa-priv-key', + output : ['ipa-priv-key.pem'], + command : [gen_ipa_priv_key, 'ML-DSA-65', '@OUTPUT@']) + endif + if signature_algo == 'rsa-sha256' + 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