From patchwork Wed Jul 1 04:07:21 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kate Hsuan X-Patchwork-Id: 27152 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 2427DC3301 for ; Wed, 1 Jul 2026 04:08:18 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id DB16065F9F; Wed, 1 Jul 2026 06:08:17 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="g0wFgqcN"; 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 7EF3265F8D for ; Wed, 1 Jul 2026 06:08:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782878895; 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=yhA3N0ZnM9yVzbFsrGsd3ZApoQ7N0UVPkKe1Lo8VIu8=; b=g0wFgqcNi9SNcG03WBzA6uhmCBQEaGYWvzlAT/NOcRrOQW/Q3Hi6qqxcaM/nYw1deZUSAN Xvv8P74KhBa5AtjagYja+FaHu6EgrtZ8QfbqS9NtGcw8Ja/fGhbnombwugttq/7YUIRoOR kWD9ClkDVShY2OYg8wPTeFlPLC52TN4= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-587-tT0BOi-fMPm7__Qa9w9_Zg-1; Wed, 01 Jul 2026 00:08:12 -0400 X-MC-Unique: tT0BOi-fMPm7__Qa9w9_Zg-1 X-Mimecast-MFC-AGG-ID: tT0BOi-fMPm7__Qa9w9_Zg_1782878891 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5CC4518C0FDC; Wed, 1 Jul 2026 04:08:11 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.67.32.18]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7781A36F01; Wed, 1 Jul 2026 04:08:08 +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 v4 4/4] meson: Add ipa-signature-algo option Date: Wed, 1 Jul 2026 12:07:21 +0800 Message-ID: <20260701040721.145659-5-hpa@redhat.com> In-Reply-To: <20260701040721.145659-1-hpa@redhat.com> References: <20260701040721.145659-1-hpa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: M_fcNW5hSsAxy0-ZNdGw32-8bEeh2GaLadPrHoOt1dw_1782878891 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 | 11 +++++++++++ src/meson.build | 6 +++++- utils/check-algo.sh | 35 +++++++++++++++++++++++++++++++++++ utils/gen-ipa-priv-key.sh | 21 ++++++++++++++++++--- 5 files changed, 77 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..cabd1041 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -89,14 +89,25 @@ 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() + r = run_command('../../utils/check-algo.sh', 'guntls', get_option('ipa-signature-algo'), check: false) + if r.returncode() != 0 + error('Unsupported signature algorithm (', 'guntls,', get_option('ipa-signature-algo'), ')') + endif config_h.set('HAVE_GNUTLS', 1) else libcrypto = dependency('libcrypto', required : false) if libcrypto.found() + r = run_command('../../utils/check-algo.sh', 'openssl', get_option('ipa-signature-algo'), check: false) + if r.returncode() != 0 + error('Unsupported signature algorithm. (', 'libcrypto,', get_option('ipa-signature-algo'), ')') + endif config_h.set('HAVE_CRYPTO', 1) endif endif +# comply with FIPS 204 +config_h.set('IPA_MODULE_DIR_SIGNATURE_ALGO', '"' + get_option('ipa-signature-algo') + '"') + 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..2ee6c7cb --- /dev/null +++ b/utils/check-algo.sh @@ -0,0 +1,35 @@ +#!/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" + +if [ "$algo" = "rsa-sha256" ]; then + algo="RSA-SHA256" +elif [ "$algo" = "ml-dsa-65" ]; then + algo="ML-DSA-65" +else + echo "Invalid algorithm: $algo" + exit 1 +fi + +if [ "$tool" = "guntls" ]; then + gnutls-cli -l | grep "$algo" > /dev/null + ret=$? +elif [ "$tool" = "openssl" ]; then + openssl list -signature-algorithms |grep ${algo} > /dev/null + ret=$? +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..3fc44bcc 100755 --- a/utils/gen-ipa-priv-key.sh +++ b/utils/gen-ipa-priv-key.sh @@ -4,8 +4,23 @@ # # Author: Laurent Pinchart # -# Generate an RSA private key to sign IPA modules +# Generate an 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 +if [ -e "${key}" ]; then + echo "File ${key} already exists. Removing it." + rm "${key}" +fi + +# 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