{"id":27364,"url":"https://patchwork.libcamera.org/api/patches/27364/?format=json","web_url":"https://patchwork.libcamera.org/patch/27364/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260715075004.36983-2-hpa@redhat.com>","date":"2026-07-15T07:50:01","name":"[v5,1/4] libcamera: pub_key: Add ML-DSA-65 signature algorithm for PQC compliance","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"bb30a9931800eebf746fb4d3adaaa3a07965e601","submitter":{"id":105,"url":"https://patchwork.libcamera.org/api/people/105/?format=json","name":"Kate Hsuan","email":"hpa@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/27364/mbox/","series":[{"id":6059,"url":"https://patchwork.libcamera.org/api/series/6059/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=6059","date":"2026-07-15T07:50:00","name":"Implement ML-DSA-65 for Post-Quantum Cryptographic compliance","version":5,"mbox":"https://patchwork.libcamera.org/series/6059/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/27364/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/27364/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id A0221C3301\n\tfor ;\n\tWed, 15 Jul 2026 07:50:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4451766166;\n\tWed, 15 Jul 2026 09:50:31 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 28EC46614E\n\tfor ;\n\tWed, 15 Jul 2026 09:50:29 +0200 (CEST)","from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-269-2iEHzCgRMMujG1MseOuSxQ-1;\n\tWed, 15 Jul 2026 03:50:24 -0400","from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 6FCBB195605B; Wed, 15 Jul 2026 07:50:23 +0000 (UTC)","from fedora.redhat.com (unknown [10.67.32.131])\n\tby mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 2661530001A2; Wed, 15 Jul 2026 07:50:19 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"GiHAT6LH\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1784101828;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=b+HToNDuU7IQ8oR2iw0y+n2wU+v6McD3SM9XGBQ50pM=;\n\tb=GiHAT6LHPud/spxROaT858aGZkrZ8gZ/9Vjb+jBwVRVTXoKcDJMb/9FflINyOckmLCFWwG\n\tQJMmKMU5Hd2t0F6f4qAxWB2DEA52DUanW4BXEPfmk2NtJK7NWSsMXWFt0KX/GA/yyMoj2I\n\t3c8DBURfH9V3bm5KPCiz44x39j7viN8=","X-MC-Unique":"2iEHzCgRMMujG1MseOuSxQ-1","X-Mimecast-MFC-AGG-ID":"2iEHzCgRMMujG1MseOuSxQ_1784101823","From":"Kate Hsuan ","To":"libcamera-devel@lists.libcamera.org, =?utf-8?b?QmFybmFiw6FzIFDFkWN6?=\n\t=?utf-8?q?e?= , Kieran Bingham\n\t, Laurent Pinchart\n\t","Cc":"Kate Hsuan ","Subject":"[PATCH v5 1/4] libcamera: pub_key: Add ML-DSA-65 signature algorithm\n\tfor 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-Transfer-Encoding":"8bit","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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"With RSA slated for deprecation by 2035, the IPA signature algorithm must\nbe migrated to a Post-Quantum Cryptography (PQC) standard. Accordingly,\nwe are adopting the NIST-finalized ML-DSA signature scheme. Among the\navailable variants, ML-DSA-44, ML-DSA-65, and ML-DSA-87, which offer\nvarying levels of data integrity protection. ML-DSA-65 has been selected\nto sign the IPA due to its balanced performance for general-purpose\napplications.\n\nLink: https://csrc.nist.gov/projects/post-quantum-cryptography/post-quantum-cryptography-standardization/evaluation-criteria/security-(evaluation-criteria)\nLink: https://nvlpubs.nist.gov/nistpubs/ir/2024/NIST.IR.8547.ipd.pdf\nSigned-off-by: Kate Hsuan \n---\n src/libcamera/pub_key.cpp | 66 +++++++++++++++++++++++++--------------\n 1 file changed, 43 insertions(+), 23 deletions(-)","diff":"diff --git a/src/libcamera/pub_key.cpp b/src/libcamera/pub_key.cpp\nindex f1d73a5c..cb64d911 100644\n--- a/src/libcamera/pub_key.cpp\n+++ b/src/libcamera/pub_key.cpp\n@@ -9,13 +9,14 @@\n \n #if HAVE_CRYPTO\n #include \n-#include \n-#include \n #include \n #elif HAVE_GNUTLS\n #include \n+#include \n #endif\n \n+#include \n+\n /**\n * \\file pub_key.h\n * \\brief Public key signature verification\n@@ -28,12 +29,17 @@ namespace libcamera {\n * \\brief Public key wrapper for signature verification\n *\n * The PubKey class wraps a public key and implements signature verification. It\n- * only supports RSA keys and the RSA-SHA256 signature algorithm.\n+ * supports RSA keys with the RSA-SHA256 signature algorithm, or ML-DSA-65 keys\n+ * as specified in NIST FIPS 204. The signature algorithm is determined at\n+ * compile time.\n */\n \n /**\n * \\brief Construct a PubKey from key data\n * \\param[in] key Key data encoded in DER format\n+ *\n+ * Supported key types are RSA (verified with RSA-SHA256) and ML-DSA-65\n+ * (verified as ML-DSA-65 according to FIPS 204).\n */\n PubKey::PubKey([[maybe_unused]] Span key)\n \t: valid_(false)\n@@ -83,7 +89,7 @@ PubKey::~PubKey()\n * \\param[in] sig The signature\n *\n * Verify that the signature \\a sig matches the signed \\a data for the public\n- * key. The signture algorithm is hardcoded to RSA-SHA256.\n+ * key.\n *\n * \\return True if the signature is valid, false otherwise\n */\n@@ -94,29 +100,20 @@ bool PubKey::verify([[maybe_unused]] Span data,\n \t\treturn false;\n \n #if HAVE_CRYPTO\n-\t/*\n-\t * Create and initialize a public key algorithm context for signature\n-\t * verification.\n-\t */\n-\tEVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new(pubkey_, nullptr);\n+\tEVP_MD_CTX *ctx = EVP_MD_CTX_new();\n \tif (!ctx)\n \t\treturn false;\n \n-\tif (EVP_PKEY_verify_init(ctx) <= 0 ||\n-\t EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PADDING) <= 0 ||\n-\t EVP_PKEY_CTX_set_signature_md(ctx, EVP_sha256()) <= 0) {\n-\t\tEVP_PKEY_CTX_free(ctx);\n+\tutils::scope_exit ctxGuard([&] { EVP_MD_CTX_free(ctx); });\n+\n+\tconst EVP_MD *md = (EVP_PKEY_get_id(pubkey_) == EVP_PKEY_RSA) ? EVP_sha256() : nullptr;\n+\tif (EVP_DigestVerifyInit(ctx, nullptr, md, nullptr,\n+\t\t\t\t pubkey_) <= 0)\n \t\treturn false;\n-\t}\n \n-\t/* Calculate the SHA256 digest of the data. */\n-\tuint8_t digest[SHA256_DIGEST_LENGTH];\n-\tSHA256(data.data(), data.size(), digest);\n+\tint ret = EVP_DigestVerify(ctx, sig.data(), sig.size(),\n+\t\t\t\t data.data(), data.size());\n \n-\t/* Decrypt the signature and verify it matches the digest. */\n-\tint ret = EVP_PKEY_verify(ctx, sig.data(), sig.size(), digest,\n-\t\t\t\t SHA256_DIGEST_LENGTH);\n-\tEVP_PKEY_CTX_free(ctx);\n \treturn ret == 1;\n #elif HAVE_GNUTLS\n \tconst gnutls_datum_t gnuTlsData{\n@@ -129,8 +126,31 @@ bool PubKey::verify([[maybe_unused]] Span data,\n \t\tstatic_cast(sig.size())\n \t};\n \n-\tint ret = gnutls_pubkey_verify_data2(pubkey_, GNUTLS_SIGN_RSA_SHA256, 0,\n-\t\t\t\t\t &gnuTlsData, &gnuTlsSig);\n+\tgnutls_pk_algorithm_t pkeyAlgo = static_cast(gnutls_pubkey_get_pk_algorithm(pubkey_, nullptr));\n+\tif (pkeyAlgo == GNUTLS_PK_UNKNOWN)\n+\t\treturn false;\n+\n+\tgnutls_sign_algorithm_t algo;\n+\tgnutls_digest_algorithm_t hash;\n+\tint ret = gnutls_pubkey_get_preferred_hash_algorithm(pubkey_, &hash, nullptr);\n+\tif (ret < 0)\n+\t\treturn false;\n+\n+\t/* GNUTLS_DIG_UNKNOWN is a valid hash algorithm for ML-DSA-65 */\n+\tif (hash == GNUTLS_DIG_UNKNOWN) {\n+\t\tif (pkeyAlgo == GNUTLS_PK_MLDSA65)\n+\t\t\talgo = GNUTLS_SIGN_MLDSA65;\n+\t\telse\n+\t\t\treturn false;\n+\t} else {\n+\t\talgo = gnutls_pk_to_sign(pkeyAlgo, hash);\n+\t\tif (algo == GNUTLS_SIGN_UNKNOWN)\n+\t\t\treturn false;\n+\t}\n+\n+\tret = gnutls_pubkey_verify_data2(pubkey_, algo, 0,\n+\t\t\t\t\t &gnuTlsData, &gnuTlsSig);\n+\n \treturn ret >= 0;\n #else\n \treturn false;\n","prefixes":["v5","1/4"]}