From patchwork Wed Apr 22 04:47:33 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kate Hsuan X-Patchwork-Id: 26533 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 C7A71BDCBD for ; Wed, 22 Apr 2026 04:48:01 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 620AA62EF7; Wed, 22 Apr 2026 06:48:01 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="dRxgVniI"; 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 1755162EB2 for ; Wed, 22 Apr 2026 06:47:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776833279; 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=OS67i9dDSYcvAJQ5U0dAc49SYK/NQYySUcxyceWs8Pg=; b=dRxgVniITJbsxSl2R4ZMxqa2oTtozLL1MlFKrSAuXyIb26lqJMnbZ2DrVH4euVQnR1LfTq in9ZJ/Ct18O7CARMtWSeYIxxZlMDT/o97EdQwD8sBgr3kUx7IYhj1G3PDt8kHd7HZx7GYU 0575smQ7FgAZlnEfEfKEowpL1wA3pYI= 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-62-WoMSjvEkPJW7RHwtuS0Ajg-1; Wed, 22 Apr 2026 00:47:57 -0400 X-MC-Unique: WoMSjvEkPJW7RHwtuS0Ajg-1 X-Mimecast-MFC-AGG-ID: WoMSjvEkPJW7RHwtuS0Ajg_1776833276 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 49BF818003FC; Wed, 22 Apr 2026 04:47:56 +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 1868C19560AB; Wed, 22 Apr 2026 04:47:53 +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 1/4] libcamera: pub_key: Add ML-DSA-65 signature algorithm for PQC compliance Date: Wed, 22 Apr 2026 12:47:33 +0800 Message-ID: <20260422044736.24717-2-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: 30IZy_tM846__uphU0BRJ6xxgiFrbR3jzbqfTTgqQxk_1776833276 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" As quantum computing advances, traditional signature algorithms are becoming vulnerable. To ensure long-term data security, this change implements ML-DSA-65, the primary Post-Quantum Cryptography (PQC) standard finalized by NIST. This addition prepares for the transition away from RSA, which is slated for deprecation by 2035. 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 | 53 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/src/libcamera/pub_key.cpp b/src/libcamera/pub_key.cpp index f1d73a5c..71c1900b 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 "libcamera/internal/pub_key.h" +#include +#include + /** * \file pub_key.h * \brief Public key signature verification @@ -23,17 +28,24 @@ namespace libcamera { +LOG_DEFINE_CATEGORY(PubKey); /** * \class PubKey * \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 in + * compile time. */ /** * \brief Construct a PubKey from key data * \param[in] key Key data encoded in DER format + * + * The signature algorithm is determined in the compile + * 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 +95,8 @@ 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. The signature algorithm is determined in compile time. RSA keys use + * RSA-SHA256, while ML-DSA keys use ML-DSA-65 mentioned in FIPS 204. * * \return True if the signature is valid, false otherwise */ @@ -94,6 +107,29 @@ bool PubKey::verify([[maybe_unused]] Span data, return false; #if HAVE_CRYPTO + +#if WITH_PQC + /* ML-DSA */ + EVP_MD_CTX *ctx_dsa = EVP_MD_CTX_new(); + if (!ctx_dsa) { + LOG(PubKey, Error) << "Initialize context for ML-DSA failed"; + return false; + } + + if (EVP_DigestVerifyInit(ctx_dsa, nullptr, nullptr, nullptr, + pubkey_) <= 0) { + EVP_MD_CTX_free(ctx_dsa); + LOG(PubKey, Error) << "Initialize ML-DSA verification failed"; + return false; + } + + int ret = EVP_DigestVerify(ctx_dsa, sig.data(), sig.size(), + data.data(), data.size()); + EVP_MD_CTX_free(ctx_dsa); + return ret == 1; +#else + /* RSA with SHA-256 */ + /* * Create and initialize a public key algorithm context for signature * verification. @@ -117,7 +153,10 @@ bool PubKey::verify([[maybe_unused]] Span data, int ret = EVP_PKEY_verify(ctx, sig.data(), sig.size(), digest, SHA256_DIGEST_LENGTH); EVP_PKEY_CTX_free(ctx); + return ret == 1; +#endif + #elif HAVE_GNUTLS const gnutls_datum_t gnuTlsData{ const_cast(data.data()), @@ -129,9 +168,17 @@ bool PubKey::verify([[maybe_unused]] Span data, static_cast(sig.size()) }; - int ret = gnutls_pubkey_verify_data2(pubkey_, GNUTLS_SIGN_RSA_SHA256, 0, +#if WITH_PQC + int ret = gnutls_pubkey_verify_data2(pubkey_, GNUTLS_SIGN_MLDSA65, 0, &gnuTlsData, &gnuTlsSig); + return ret >= 0; +#else + int ret = gnutls_pubkey_verify_data2(pubkey_, GNUTLS_SIGN_RSA_SHA256, + 0, &gnuTlsData, &gnuTlsSig); + + return ret >= 0; +#endif #else return false; #endif From patchwork Wed Apr 22 04:47:34 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kate Hsuan X-Patchwork-Id: 26534 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 49FC6BDCBD for ; Wed, 22 Apr 2026 04:48:08 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0614B62F02; Wed, 22 Apr 2026 06:48:08 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="PWTpmHtx"; 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 3F04A62EF6 for ; Wed, 22 Apr 2026 06:48:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776833285; 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=D9qCCis4eRvsITI//rK+ZrugHCkG7PHRqrroma9Wyc4=; b=PWTpmHtx2wBinXVZFstQnE6sM0EK/I5HFZTOBEZZBdBauA32YW4R8tt95jp4f5fp34V+lM R+MasMsDihKA6cKVSy7Qz90q947VT31vj4GkqBLkNBy8b1O5G7ztrKSpekMYdQJVeRPZWA B2EjahPtIZxBPquD4q3itmjtrPC7osM= 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-596-hD9koaLpOZKgdpr2syDRtg-1; Wed, 22 Apr 2026 00:48:01 -0400 X-MC-Unique: hD9koaLpOZKgdpr2syDRtg-1 X-Mimecast-MFC-AGG-ID: hD9koaLpOZKgdpr2syDRtg_1776833280 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 98A11195608B; Wed, 22 Apr 2026 04:48:00 +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 18C2A19560AB; Wed, 22 Apr 2026 04:47:57 +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 2/4] utils: codegen: gen-ipa-pub-key: replace openssl rsa with openssl pkey Date: Wed, 22 Apr 2026 12:47:34 +0800 Message-ID: <20260422044736.24717-3-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: LHNQ-21K5MCDiw4ogGejBMDeNCgqdm4YFjCw6Ln9ocI_1776833280 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 --- 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 Apr 22 04:47:35 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kate Hsuan X-Patchwork-Id: 26535 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 49151BDCBD for ; Wed, 22 Apr 2026 04:48:10 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E504E62F09; Wed, 22 Apr 2026 06:48:09 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="dO2KUqQ7"; 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 D692462EFD for ; Wed, 22 Apr 2026 06:48:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776833287; 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=dX5SJ4UDYK7YMOJNtEJuBv461pbH/sGRkDeyX88xy/o=; b=dO2KUqQ7dtcrgy+ryIbkvQvswHv6QQY42YM2l3Oib2iHqH6ajFf1tQMSgyS4v8UF34oEWy /QyjmWWcBfwuThIJvu3kR/gHND9lDrkx3DR4eDd0lgZInYeYDMxOomynxFbmQpvzXLPhra qraBvlc6u0qv1QPWUc0iL7Ha5OBjFK4= 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-648--OFIoIkpNBqgim_PYIKv7A-1; Wed, 22 Apr 2026 00:48:06 -0400 X-MC-Unique: -OFIoIkpNBqgim_PYIKv7A-1 X-Mimecast-MFC-AGG-ID: -OFIoIkpNBqgim_PYIKv7A_1776833285 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DA21418003FC; Wed, 22 Apr 2026 04:48:04 +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 94B6419560AB; Wed, 22 Apr 2026 04:48:02 +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 3/4] ipa: ipa-sign: Sign IPA according to the signature algorithm of the key Date: Wed, 22 Apr 2026 12:47:35 +0800 Message-ID: <20260422044736.24717-4-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: 6SE1vaPrCwxesWyZrfXB4M2T7WAGyp1boRkNv6-CY8g_1776833285 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 --- 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 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