From nobody Fri Dec 19 18:59:58 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3CE58350A00 for ; Thu, 6 Nov 2025 17:45:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762451153; cv=none; b=PogYHJoCndqMlMKTTbOuL5zVvnAp0t2YHPHOYN8qNyAg41MFYlWUHluhLAA/tH4abax1hlc9n2jydv5ysy2RcMQi8Kap6hab0lhzbVr7Z+LLEEnUNqxC0lYXjxQmbzia0Bhd0jB1LzSpZmFrMR8+kTmj6NaM0UbHHoj1iEaPdcY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762451153; c=relaxed/simple; bh=RvusHb8iCMBSU7BMwlq1o6N1lbxg25PBi5W0BeXHl0g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VFc4Y/0SQCVAATg90+g/sDAe7enG8KDqY3X7ZU3AzJEnhLwXI2qAAx/lvHyp8vW+zs5kbjCxLHVQaDfvnlDroOo3qCujEUL8q5TDVNn9DSgmyWybswbtDCqTTx7v+oxl3PkFCgMA+Gya3AEA58yS0u7HuoSq2Hm0fs29TDYV0Wo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=SHdVmtuE; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SHdVmtuE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762451148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dwXTvBD4Yvz8oojCSyImVAOTuEGuJkeQWe5NSzvpamE=; b=SHdVmtuEAd2onL80wyhSpI0B49pLgQOmgtyD4DkYmTBOuzawF3fyVuWo64O9OF6U3zKVew 5svaBn1FHs+g3NMbysxwoxmzDaKle6mKK2cbpNgJ3cIbOEOZpifdUCpo5n1O/DJMQnybtT QBVEDIV+Qs6xK32OFaUoYb9A9RPzqk8= 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-372-W1d-4TabM9iJJOSfvszwLg-1; Thu, 06 Nov 2025 12:45:45 -0500 X-MC-Unique: W1d-4TabM9iJJOSfvszwLg-1 X-Mimecast-MFC-AGG-ID: W1d-4TabM9iJJOSfvszwLg_1762451142 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 56BA01801234; Thu, 6 Nov 2025 17:45:42 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.6]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D93121945110; Thu, 6 Nov 2025 17:45:38 +0000 (UTC) From: David Howells To: Herbert Xu Cc: David Howells , Eric Biggers , Luis Chamberlain , Petr Pavlu , Daniel Gomez , Sami Tolvanen , "Jason A . Donenfeld" , Ard Biesheuvel , Stephan Mueller , Lukas Wunner , Ignat Korchagin , linux-crypto@vger.kernel.org, keyrings@vger.kernel.org, linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 7/8] pkcs7, x509: Add ML-DSA support Date: Thu, 6 Nov 2025 17:44:51 +0000 Message-ID: <20251106174456.31818-8-dhowells@redhat.com> In-Reply-To: <20251106174456.31818-1-dhowells@redhat.com> References: <20251106174456.31818-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" Add support for ML-DSA keys and signatures to the PKCS#7 and X.509 implementations. Signed-off-by: David Howells cc: Lukas Wunner cc: Ignat Korchagin cc: Stephan Mueller cc: Eric Biggers cc: Herbert Xu cc: keyrings@vger.kernel.org cc: linux-crypto@vger.kernel.org --- crypto/asymmetric_keys/pkcs7_parser.c | 15 ++++++++++++++ crypto/asymmetric_keys/public_key.c | 7 +++++++ crypto/asymmetric_keys/x509_cert_parser.c | 24 +++++++++++++++++++++++ include/linux/oid_registry.h | 5 +++++ 4 files changed, 51 insertions(+) diff --git a/crypto/asymmetric_keys/pkcs7_parser.c b/crypto/asymmetric_keys= /pkcs7_parser.c index 3cdbab3b9f50..d7c88b90a4fd 100644 --- a/crypto/asymmetric_keys/pkcs7_parser.c +++ b/crypto/asymmetric_keys/pkcs7_parser.c @@ -297,6 +297,21 @@ int pkcs7_sig_note_pkey_algo(void *context, size_t hdr= len, ctx->sinfo->sig->pkey_algo =3D "ecrdsa"; ctx->sinfo->sig->encoding =3D "raw"; break; + case OID_id_ml_dsa_44: + ctx->sinfo->sig->pkey_algo =3D "ml-dsa44"; + ctx->sinfo->sig->encoding =3D "raw"; + ctx->sinfo->sig->algo_does_hash =3D true; + break; + case OID_id_ml_dsa_65: + ctx->sinfo->sig->pkey_algo =3D "ml-dsa65"; + ctx->sinfo->sig->encoding =3D "raw"; + ctx->sinfo->sig->algo_does_hash =3D true; + break; + case OID_id_ml_dsa_87: + ctx->sinfo->sig->pkey_algo =3D "ml-dsa87"; + ctx->sinfo->sig->encoding =3D "raw"; + ctx->sinfo->sig->algo_does_hash =3D true; + break; default: printk("Unsupported pkey algo: %u\n", ctx->last_oid); return -ENOPKG; diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/p= ublic_key.c index e5b177c8e842..96e084668d1b 100644 --- a/crypto/asymmetric_keys/public_key.c +++ b/crypto/asymmetric_keys/public_key.c @@ -142,6 +142,13 @@ software_key_determine_akcipher(const struct public_ke= y *pkey, if (strcmp(hash_algo, "streebog256") !=3D 0 && strcmp(hash_algo, "streebog512") !=3D 0) return -EINVAL; + } else if (strcmp(pkey->pkey_algo, "ml-dsa44") =3D=3D 0 || + strcmp(pkey->pkey_algo, "ml-dsa65") =3D=3D 0 || + strcmp(pkey->pkey_algo, "ml-dsa87") =3D=3D 0) { + if (strcmp(encoding, "raw") !=3D 0) + return -EINVAL; + if (!hash_algo) + return -EINVAL; } else { /* Unknown public key algorithm */ return -ENOPKG; diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_= keys/x509_cert_parser.c index 8df3fa60a44f..6a2a77a647a5 100644 --- a/crypto/asymmetric_keys/x509_cert_parser.c +++ b/crypto/asymmetric_keys/x509_cert_parser.c @@ -257,6 +257,15 @@ int x509_note_sig_algo(void *context, size_t hdrlen, u= nsigned char tag, case OID_gost2012Signature512: ctx->cert->sig->hash_algo =3D "streebog512"; goto ecrdsa; + case OID_id_ml_dsa_44: + ctx->cert->sig->pkey_algo =3D "ml-dsa44"; + goto ml_dsa; + case OID_id_ml_dsa_65: + ctx->cert->sig->pkey_algo =3D "ml-dsa65"; + goto ml_dsa; + case OID_id_ml_dsa_87: + ctx->cert->sig->pkey_algo =3D "ml-dsa87"; + goto ml_dsa; } =20 rsa_pkcs1: @@ -274,6 +283,12 @@ int x509_note_sig_algo(void *context, size_t hdrlen, u= nsigned char tag, ctx->cert->sig->encoding =3D "x962"; ctx->sig_algo =3D ctx->last_oid; return 0; +ml_dsa: + ctx->cert->sig->algo_does_hash =3D true; + ctx->cert->sig->hash_algo =3D ctx->cert->sig->pkey_algo; + ctx->cert->sig->encoding =3D "raw"; + ctx->sig_algo =3D ctx->last_oid; + return 0; } =20 /* @@ -524,6 +539,15 @@ int x509_extract_key_data(void *context, size_t hdrlen, return -ENOPKG; } break; + case OID_id_ml_dsa_44: + ctx->cert->pub->pkey_algo =3D "ml-dsa44"; + break; + case OID_id_ml_dsa_65: + ctx->cert->pub->pkey_algo =3D "ml-dsa65"; + break; + case OID_id_ml_dsa_87: + ctx->cert->pub->pkey_algo =3D "ml-dsa87"; + break; default: return -ENOPKG; } diff --git a/include/linux/oid_registry.h b/include/linux/oid_registry.h index 6de479ebbe5d..30821a6a4f72 100644 --- a/include/linux/oid_registry.h +++ b/include/linux/oid_registry.h @@ -145,6 +145,11 @@ enum OID { OID_id_rsassa_pkcs1_v1_5_with_sha3_384, /* 2.16.840.1.101.3.4.3.15 */ OID_id_rsassa_pkcs1_v1_5_with_sha3_512, /* 2.16.840.1.101.3.4.3.16 */ =20 + /* NIST FIPS-204 ML-DSA (Dilithium) */ + OID_id_ml_dsa_44, /* 2.16.840.1.101.3.4.3.17 */ + OID_id_ml_dsa_65, /* 2.16.840.1.101.3.4.3.18 */ + OID_id_ml_dsa_87, /* 2.16.840.1.101.3.4.3.19 */ + OID__NR };