From patchwork Wed Jul 15 07:50:01 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kate Hsuan X-Patchwork-Id: 27364 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 A0221C3301 for ; Wed, 15 Jul 2026 07:50:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4451766166; Wed, 15 Jul 2026 09:50:31 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="GiHAT6LH"; 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 28EC46614E for ; Wed, 15 Jul 2026 09:50:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784101828; 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=b+HToNDuU7IQ8oR2iw0y+n2wU+v6McD3SM9XGBQ50pM=; b=GiHAT6LHPud/spxROaT858aGZkrZ8gZ/9Vjb+jBwVRVTXoKcDJMb/9FflINyOckmLCFWwG QJMmKMU5Hd2t0F6f4qAxWB2DEA52DUanW4BXEPfmk2NtJK7NWSsMXWFt0KX/GA/yyMoj2I 3c8DBURfH9V3bm5KPCiz44x39j7viN8= 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-269-2iEHzCgRMMujG1MseOuSxQ-1; Wed, 15 Jul 2026 03:50:24 -0400 X-MC-Unique: 2iEHzCgRMMujG1MseOuSxQ-1 X-Mimecast-MFC-AGG-ID: 2iEHzCgRMMujG1MseOuSxQ_1784101823 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 6FCBB195605B; Wed, 15 Jul 2026 07:50:23 +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 2661530001A2; Wed, 15 Jul 2026 07:50:19 +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 1/4] libcamera: pub_key: Add ML-DSA-65 signature algorithm for PQC compliance Date: Wed, 15 Jul 2026 15:50:01 +0800 Message-ID: <20260715075004.36983-2-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: U5jhLibrHWKyMlTPPsnVGNR2QFRFTB7hZ326kFPLAxY_1784101823 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 | 66 +++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 23 deletions(-) diff --git a/src/libcamera/pub_key.cpp b/src/libcamera/pub_key.cpp index f1d73a5c..cb64d911 100644 --- a/src/libcamera/pub_key.cpp +++ b/src/libcamera/pub_key.cpp @@ -9,13 +9,14 @@ #if HAVE_CRYPTO #include -#include -#include #include #elif HAVE_GNUTLS #include +#include #endif +#include + /** * \file pub_key.h * \brief Public key signature verification @@ -28,12 +29,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 +89,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,29 +100,20 @@ 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); }); + + const EVP_MD *md = (EVP_PKEY_get_id(pubkey_) == EVP_PKEY_RSA) ? EVP_sha256() : nullptr; + if (EVP_DigestVerifyInit(ctx, nullptr, md, 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{ @@ -129,8 +126,31 @@ bool PubKey::verify([[maybe_unused]] Span data, static_cast(sig.size()) }; - int ret = gnutls_pubkey_verify_data2(pubkey_, GNUTLS_SIGN_RSA_SHA256, 0, - &gnuTlsData, &gnuTlsSig); + gnutls_pk_algorithm_t pkeyAlgo = static_cast(gnutls_pubkey_get_pk_algorithm(pubkey_, nullptr)); + if (pkeyAlgo == GNUTLS_PK_UNKNOWN) + return false; + + gnutls_sign_algorithm_t algo; + gnutls_digest_algorithm_t hash; + int ret = gnutls_pubkey_get_preferred_hash_algorithm(pubkey_, &hash, nullptr); + if (ret < 0) + return false; + + /* GNUTLS_DIG_UNKNOWN is a valid hash algorithm for ML-DSA-65 */ + if (hash == GNUTLS_DIG_UNKNOWN) { + if (pkeyAlgo == GNUTLS_PK_MLDSA65) + algo = GNUTLS_SIGN_MLDSA65; + else + return false; + } else { + algo = gnutls_pk_to_sign(pkeyAlgo, hash); + if (algo == GNUTLS_SIGN_UNKNOWN) + return false; + } + + ret = gnutls_pubkey_verify_data2(pubkey_, algo, 0, + &gnuTlsData, &gnuTlsSig); + return ret >= 0; #else return false; From patchwork Wed Jul 15 07:50:02 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kate Hsuan X-Patchwork-Id: 27365 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 522A9C3301 for ; Wed, 15 Jul 2026 07:50:36 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E7E286615B; Wed, 15 Jul 2026 09:50:35 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="K0wt6Qk5"; 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 123E16615B for ; Wed, 15 Jul 2026 09:50:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784101833; 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=pl0pWR8bW5nScoEbzhPlaMA3rzNiJtXSTACD+YdX6Yg=; b=K0wt6Qk5I0jXglrpl0fTzgFZZjG2epYt8hZgT+XXEEaqWvEdJpGaLQGQUIM432ExZTnBev dDL8/8JSDKAkAoBB+W0Or5CiWfdvuXf3OvSkChwmY3cHNYk++ZlghOMZnPJE19vhiwAF1Y a7LPeickX5wm4wQME9PpDdc9iNT0CLg= 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-451-oPZH8y2POIq1pgWSn-FMZw-1; Wed, 15 Jul 2026 03:50:29 -0400 X-MC-Unique: oPZH8y2POIq1pgWSn-FMZw-1 X-Mimecast-MFC-AGG-ID: oPZH8y2POIq1pgWSn-FMZw_1784101828 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 6470E1956041; Wed, 15 Jul 2026 07:50:28 +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 6C5F030001A2; Wed, 15 Jul 2026 07:50:24 +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 2/4] utils: codegen: gen-ipa-pub-key: replace openssl rsa with openssl pkey Date: Wed, 15 Jul 2026 15:50:02 +0800 Message-ID: <20260715075004.36983-3-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: Xg7l38zb51ctJPtDaVgnV4oT9TYe3T1QkN0a29zMU3s_1784101828 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 15 07:50:03 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kate Hsuan X-Patchwork-Id: 27366 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 CAC8BC3301 for ; Wed, 15 Jul 2026 07:50:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8E9EF66164; Wed, 15 Jul 2026 09:50:46 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="MTQtPIeY"; 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 22E0A6615B for ; Wed, 15 Jul 2026 09:50:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784101843; 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=mrjuikBaZ4K7GiF2gjyEv9YnxyKARyL4vK0ZmFfbnCc=; b=MTQtPIeYEqtu1WYkycB6vPJOTNuAUkihkVq7xD4UfZXC7KWGehhoNRIzJKLYQAXeqYFF/u nbHCUc1o6FKOF7JiHzOOwLhRfbVq8x+ahIl8nhKu2U3wsZbBnsQPHyGAlosmB1nPwDT51o h0NEYyEgSZ2Ag6qS66KfT6+A7Lwuezo= Received: from mx-prod-mc-06.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-259-Njx4V7bbNkSgpwSMdsSPBQ-1; Wed, 15 Jul 2026 03:50:39 -0400 X-MC-Unique: Njx4V7bbNkSgpwSMdsSPBQ-1 X-Mimecast-MFC-AGG-ID: Njx4V7bbNkSgpwSMdsSPBQ_1784101838 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0F8011800576; Wed, 15 Jul 2026 07:50:38 +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 01B2130001BB; Wed, 15 Jul 2026 07:50:34 +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 3/4] ipa: ipa-sign: Sign IPA according to the signature algorithm of the key Date: Wed, 15 Jul 2026 15:50:03 +0800 Message-ID: <20260715075004.36983-4-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: xyYmDPumVbryIUOCkk0ivSQo1j7Pm3OSxqxCJEfZ3o4_1784101838 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" 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 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')