From patchwork Wed Jul 1 04:07:18 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kate Hsuan X-Patchwork-Id: 27149 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 8FB48C3301 for ; Wed, 1 Jul 2026 04:07:54 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3254065F8D; Wed, 1 Jul 2026 06:07:54 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="i1E3bKUF"; 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 5883465F29 for ; Wed, 1 Jul 2026 06:07:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782878872; 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=z4v9OmyikCG6t4glmU0P1PyKbCqy0i6mJeJVlwWYDDs=; b=i1E3bKUFOKT2nYq6773eiw0MKIKp3EMNYgDfSoHw48ORZtDLF4WzmMzNIuJht1L9GGiK+Y A7YIy30HB2/O4RdfAEhyTUHU2VfT2GCiRhZN+0A1Y5XvjHrW/i1arn43Af203m1m9beZ6e gKlPulYwv92/CIt7IpQ5TzmqLQhdiao= Received: from mx-prod-mc-05.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-711-ooas6dszPwesBubIlm5kNA-1; Wed, 01 Jul 2026 00:07:48 -0400 X-MC-Unique: ooas6dszPwesBubIlm5kNA-1 X-Mimecast-MFC-AGG-ID: ooas6dszPwesBubIlm5kNA_1782878867 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3D6221964CCF; Wed, 1 Jul 2026 04:07:47 +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 1E3F436936; Wed, 1 Jul 2026 04:07: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 v4 1/4] libcamera: pub_key: Add ML-DSA-65 signature algorithm for PQC compliance Date: Wed, 1 Jul 2026 12:07:18 +0800 Message-ID: <20260701040721.145659-2-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: 7CHVK2hj8kEvQEh8HMxAIXT3K8ntPWebeC7l2EE3s6s_1782878867 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" With RSA slated for deprecation by 2035, the IPA signature algorithm must be migrated to a Post-Quantum Cryptography (PQC) standard. Accordingly, we are adopting the NIST-finalized ML-DSA signature scheme. Among the available variants, ML-DSA-44, ML-DSA-65, and ML-DSA-87, which offer varying levels of data integrity protection. ML-DSA-65 has been selected to sign the IPA due to its balanced performance for general-purpose applications. Link: https://csrc.nist.gov/projects/post-quantum-cryptography/post-quantum-cryptography-standardization/evaluation-criteria/security-(evaluation-criteria) Link: https://nvlpubs.nist.gov/nistpubs/ir/2024/NIST.IR.8547.ipd.pdf Signed-off-by: Kate Hsuan --- src/libcamera/pub_key.cpp | 45 ++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/src/libcamera/pub_key.cpp b/src/libcamera/pub_key.cpp index f1d73a5c..539a4e6d 100644 --- a/src/libcamera/pub_key.cpp +++ b/src/libcamera/pub_key.cpp @@ -14,8 +14,13 @@ #include #elif HAVE_GNUTLS #include +#include #endif +#include + +#include "libcamera/internal/pub_key.h" + /** * \file pub_key.h * \brief Public key signature verification @@ -28,12 +33,17 @@ namespace libcamera { * \brief Public key wrapper for signature verification * * The PubKey class wraps a public key and implements signature verification. It - * only supports RSA keys and the RSA-SHA256 signature algorithm. + * supports RSA keys with the RSA-SHA256 signature algorithm, or ML-DSA-65 keys + * as specified in NIST FIPS 204. The signature algorithm is determined at + * compile time. */ /** * \brief Construct a PubKey from key data * \param[in] key Key data encoded in DER format + * + * Supported key types are RSA (verified with RSA-SHA256) and ML-DSA-65 + * (verified as ML-DSA-65 according to FIPS 204). */ PubKey::PubKey([[maybe_unused]] Span key) : valid_(false) @@ -83,7 +93,7 @@ PubKey::~PubKey() * \param[in] sig The signature * * Verify that the signature \a sig matches the signed \a data for the public - * key. The signture algorithm is hardcoded to RSA-SHA256. + * key. * * \return True if the signature is valid, false otherwise */ @@ -94,30 +104,21 @@ bool PubKey::verify([[maybe_unused]] Span data, return false; #if HAVE_CRYPTO - /* - * Create and initialize a public key algorithm context for signature - * verification. - */ - EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new(pubkey_, nullptr); + EVP_MD_CTX *ctx = EVP_MD_CTX_new(); if (!ctx) return false; - if (EVP_PKEY_verify_init(ctx) <= 0 || - EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PADDING) <= 0 || - EVP_PKEY_CTX_set_signature_md(ctx, EVP_sha256()) <= 0) { - EVP_PKEY_CTX_free(ctx); + utils::scope_exit ctxGuard([&] { EVP_MD_CTX_free(ctx); }); + + if (EVP_DigestVerifyInit(ctx, nullptr, nullptr, nullptr, + pubkey_) <= 0) return false; - } - /* Calculate the SHA256 digest of the data. */ - uint8_t digest[SHA256_DIGEST_LENGTH]; - SHA256(data.data(), data.size(), digest); + int ret = EVP_DigestVerify(ctx, sig.data(), sig.size(), + data.data(), data.size()); - /* Decrypt the signature and verify it matches the digest. */ - int ret = EVP_PKEY_verify(ctx, sig.data(), sig.size(), digest, - SHA256_DIGEST_LENGTH); - EVP_PKEY_CTX_free(ctx); return ret == 1; + #elif HAVE_GNUTLS const gnutls_datum_t gnuTlsData{ const_cast(data.data()), @@ -129,8 +130,12 @@ bool PubKey::verify([[maybe_unused]] Span data, static_cast(sig.size()) }; - int ret = gnutls_pubkey_verify_data2(pubkey_, GNUTLS_SIGN_RSA_SHA256, 0, + constexpr gnutls_sign_algorithm_t algo = + std::string(IPA_MODULE_DIR_SIGNATURE_ALGO) == std::string("ml-dsa-65") ? GNUTLS_SIGN_MLDSA65 : GNUTLS_SIGN_RSA_SHA256; + + int ret = gnutls_pubkey_verify_data2(pubkey_, algo, 0, &gnuTlsData, &gnuTlsSig); + return ret >= 0; #else return false; From patchwork Wed Jul 1 04:07:19 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kate Hsuan X-Patchwork-Id: 27150 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 15C6DC3301 for ; Wed, 1 Jul 2026 04:08:05 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BBA5C65F98; Wed, 1 Jul 2026 06:08:04 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="VHhuRKeZ"; 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 28B6665F74 for ; Wed, 1 Jul 2026 06:08:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782878881; 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=ns6S0ckLZ1AHMqpDJmGLBetJbv2ucIyGUx7UZY2ovv0=; b=VHhuRKeZsQJ9HJKFOigpeUYH3p7enShlTVFz0nPA9cElHBxxtWt94d2qs2aqmyHyZQrtSz 2jPtDQ16VxNh5WZtLyPAbB+0UcXjH6i1TsQysPSa9JjDVlPU2y+an0lZUAgxqowFiFY7Kz TFHjRs91ycqsIsfE+hA62HoaX8cH5MA= 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-144-ayqdJlqNMfC9-iPr2ilzRA-1; Wed, 01 Jul 2026 00:07:58 -0400 X-MC-Unique: ayqdJlqNMfC9-iPr2ilzRA-1 X-Mimecast-MFC-AGG-ID: ayqdJlqNMfC9-iPr2ilzRA_1782878877 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0E29A19540C3; Wed, 1 Jul 2026 04:07:57 +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 9110936939; Wed, 1 Jul 2026 04:07:53 +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 2/4] utils: codegen: gen-ipa-pub-key: replace openssl rsa with openssl pkey Date: Wed, 1 Jul 2026 12:07:19 +0800 Message-ID: <20260701040721.145659-3-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: YKjuR_GWLTuw6tEv3uj6VqnHVcsKRw-cop5t08m75do_1782878877 X-Mimecast-Originator: redhat.com 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" The command "openssl ras" was replaced with "openssl pkey" to cover different key algorithms. Signed-off-by: Kate Hsuan Reviewed-by: Barnabás Pőcze Reviewed-by: Laurent Pinchart --- utils/codegen/gen-ipa-pub-key.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/codegen/gen-ipa-pub-key.py b/utils/codegen/gen-ipa-pub-key.py index dc3e7d5f..9854c0c2 100755 --- a/utils/codegen/gen-ipa-pub-key.py +++ b/utils/codegen/gen-ipa-pub-key.py @@ -21,7 +21,7 @@ def main(argv): output = argv[3] try: - ret = subprocess.run(['openssl', 'rsa', '-pubout', '-in', priv_key, + ret = subprocess.run(['openssl', 'pkey', '-pubout', '-in', priv_key, '-outform', 'DER'], stdout=subprocess.PIPE) except FileNotFoundError: From patchwork Wed Jul 1 04:07:20 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kate Hsuan X-Patchwork-Id: 27151 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 9B9D2C3301 for ; Wed, 1 Jul 2026 04:08:09 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 46B3F65F9C; Wed, 1 Jul 2026 06:08:09 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="JVLJaGVD"; 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 1F8FA65F74 for ; Wed, 1 Jul 2026 06:08:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782878887; 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=0QYDAs/fRdhHTzeqAGf62K/feelDFM2Pa3X1bz7SjK0=; b=JVLJaGVDP+9jyM12V8gk5R3lnxKtd/EW/RVebeo8MyFaY2hjKFMzqaeKo7utpepCKHarpx rWuvi7YVVQpX8PXZ0cnF1FGNLNjBGHWTQzPpWlh839ostB1rCCXcBa8HCwFwzDZhifwTO2 SNCimaQX8uola4d0UgfmQoP4RKxc+L4= 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-338-SrIunikLOOSix-BucaNSRA-1; Wed, 01 Jul 2026 00:08:05 -0400 X-MC-Unique: SrIunikLOOSix-BucaNSRA-1 X-Mimecast-MFC-AGG-ID: SrIunikLOOSix-BucaNSRA_1782878884 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 56F481945102; Wed, 1 Jul 2026 04:08:04 +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 671AF36939; Wed, 1 Jul 2026 04:08:00 +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 3/4] ipa: ipa-sign: Sign IPA according to the signature algorithm of the key Date: Wed, 1 Jul 2026 12:07:20 +0800 Message-ID: <20260701040721.145659-4-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: Mb0wywPbSnUkjZfxm28ynn76g16cnZAdzD8ol80Bgps_1782878884 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" Sign IPA according to the signature algorithm of the key. Signed-off-by: Kate Hsuan Reviewed-by: Laurent Pinchart Reviewed-by: Barnabás Pőcze --- src/ipa/ipa-sign.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ipa/ipa-sign.sh b/src/ipa/ipa-sign.sh index 69024213..b7c7c47b 100755 --- a/src/ipa/ipa-sign.sh +++ b/src/ipa/ipa-sign.sh @@ -10,4 +10,4 @@ key="$1" input="$2" output="$3" -openssl dgst -sha256 -sign "${key}" -out "${output}" "${input}" +openssl pkeyutl -sign -inkey "${key}" -rawin -in "${input}" -out "${output}" 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