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;