From patchwork Wed Jul 15 07:50:04 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kate Hsuan X-Patchwork-Id: 27367 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 9EB98C3301 for ; Wed, 15 Jul 2026 07:50:54 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1709F66168; Wed, 15 Jul 2026 09:50:54 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="ZeQuP001"; 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 D99AA6615B for ; Wed, 15 Jul 2026 09:50:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784101851; 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=YGSnuMdupC9fBPBw59obctNZ/izhDTGqyyrmT8K0xz8=; b=ZeQuP001oi60qp8pYrbQcFChMOUr3FzC/9E00J3aKCAuLtRn3mlxE1Jh0nyO3Dalx6h7a+ 1hD0mste27AQiOlkBRW5GyJW87M3OwtXSB9PRAlhdfcdA6mELiERkIiCtyt972JIqYPDCt fQw9PquuPQoGaP9ZUQaSTRxhlu6dKGw= 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-49-vR8BxgIgMvyc589KjTSMzA-1; Wed, 15 Jul 2026 03:50:48 -0400 X-MC-Unique: vR8BxgIgMvyc589KjTSMzA-1 X-Mimecast-MFC-AGG-ID: vR8BxgIgMvyc589KjTSMzA_1784101847 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 05A971956041; Wed, 15 Jul 2026 07:50:47 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.67.32.131]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EA13B30001A2; Wed, 15 Jul 2026 07:50:43 +0000 (UTC) From: Kate Hsuan To: libcamera-devel@lists.libcamera.org, =?utf-8?b?QmFybmFiw6FzIFDFkWN6?= =?utf-8?q?e?= , Kieran Bingham , Laurent Pinchart Cc: Kate Hsuan Subject: [PATCH v5 4/4] meson: Add ipa-signature-algo option Date: Wed, 15 Jul 2026 15:50:04 +0800 Message-ID: <20260715075004.36983-5-hpa@redhat.com> In-Reply-To: <20260715075004.36983-1-hpa@redhat.com> References: <20260715075004.36983-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: ZTsKYGAX8Gvgel2CgNtiCGErrSM3iKFQVCtCCxhlTcw_1784101847 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 | 12 ++++++++++++ src/meson.build | 6 +++++- utils/check-algo.sh | 37 +++++++++++++++++++++++++++++++++++++ utils/gen-ipa-priv-key.sh | 16 +++++++++++++--- utils/meson.build | 3 +++ 6 files changed, 78 insertions(+), 4 deletions(-) create mode 100755 utils/check-algo.sh 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..1bb64090 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -89,14 +89,26 @@ libyaml = dependency('yaml-0.1', default_options : [ # Use one of gnutls or libcrypto (provided by OpenSSL), trying gnutls first. libcrypto = dependency('gnutls', required : false) if libcrypto.found() + crypto_library = 'gnutls' config_h.set('HAVE_GNUTLS', 1) else libcrypto = dependency('libcrypto', required : false) if libcrypto.found() + crypto_library = 'openssl' config_h.set('HAVE_CRYPTO', 1) endif endif +# Verify that the library supports the selected algorithm (RSA-SHA256 or ML-DSA-65). +if libcrypto.found() + ipa_signature_algo = get_option('ipa-signature-algo') + r = run_command(check_algo, crypto_library, ipa_signature_algo, check : false) + if r.returncode() != 0 + error('Unsupported signature @0@ algorithm in @1@' + .format(ipa_signature_algo, crypto_library)) + endif +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..4111f591 100644 --- a/src/meson.build +++ b/src/meson.build @@ -19,7 +19,11 @@ 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@']) + command : [ + gen_ipa_priv_key, + get_option('ipa-signature-algo'), + '@OUTPUT@' + ]) config_h.set('HAVE_IPA_PUBKEY', 1) ipa_sign_module = true else diff --git a/utils/check-algo.sh b/utils/check-algo.sh new file mode 100755 index 00000000..a46d72ef --- /dev/null +++ b/utils/check-algo.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2026, Red Hat Inc. +# +# Author: Kate Hsuan +# +# Check if the given algorithm is supported by the library + +tool="$1" +algo="$2" + +algo=$(echo $algo | tr '[:lower:]' '[:upper:]') + +if [ "$tool" = "gnutls" ]; then + gnutls-cli -l | grep "$algo" > /dev/null + ret=$? +elif [ "$tool" = "openssl" ]; then + if [ "$algo" = "ML-DSA-65" ]; then + openssl list -signature-algorithms |grep ${algo} > /dev/null + ret=$? + else + openssl list -signature-algorithms |grep "RSA" > /dev/null + ret=$? + if [ $ret -eq 0 ]; then + openssl list -digest-algorithms |grep "SHA256" > /dev/null + ret=$? + fi + fi +else + echo "Invalid tool: $tool" + exit 1 +fi + +if [ $ret -ne 0 ]; then + echo "Algorithm $algo is not supported by $tool" + exit 1 +fi diff --git a/utils/gen-ipa-priv-key.sh b/utils/gen-ipa-priv-key.sh index 2ca7b883..72d9cea5 100755 --- a/utils/gen-ipa-priv-key.sh +++ b/utils/gen-ipa-priv-key.sh @@ -4,8 +4,18 @@ # # Author: Laurent Pinchart # -# Generate an RSA private key to sign IPA modules +# Generate a private key for the given algorithm 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 + +if [ "$algo" = "rsa-sha256" ]; then + openssl genpkey -algorithm RSA -out "${key}" +elif [ "$algo" = "ml-dsa-65" ]; then + openssl genpkey -algorithm ML-DSA-65 -out "${key}" +else + echo "Invalid algorithm: $algo" + exit 1 +fi diff --git a/utils/meson.build b/utils/meson.build index 9c598793..b2e6f9f1 100644 --- a/utils/meson.build +++ b/utils/meson.build @@ -5,6 +5,9 @@ subdir('ipu3') gen_shader_headers = files('gen-shader-headers.sh') +## Check signature algorithm +check_algo = files('check-algo.sh') + ## Module signing gen_ipa_priv_key = files('gen-ipa-priv-key.sh')