From nobody Tue Jan 27 00:12:57 2026 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 CF7E01F1537 for ; Mon, 26 Jan 2026 14:30:09 +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=1769437812; cv=none; b=Qtu6O4ro+Jq8AymOUAdePorq+JnM6R/B7bcvH72xtDn1otQiJ2qy1oMWpaKglGm0mGTFS8Vw6OGYgdoWR8wo0dIL3XxziKs58XlTkHCxhEd1j23uHGnd+YRAM2fCEMtmkx4SYIwPaVpMPbKYpdqZyUE194nOA5xhxTd4o+IuuKg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769437812; c=relaxed/simple; bh=BaZwkH+RnIU/w8tcrlS+3/n3/FqQIRDSqJGaDeb2APE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ipfVRdeD5WPHARAsKXPQlDP9e9CQ3Ze3ycWIZ84GU9k9xnxysOU6+kAgiwGVwtcvXIzuAmlw8jLeDOyAzA/7bZD18yWiK1bbcyiOMc8I8LNWRbfP/c0euBzv1+EPbdHapSL2wo/BGtninz5UzL7UusSxuG7DUfhxCEDtplwPHtA= 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=EtswgNmB; 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="EtswgNmB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1769437808; 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=RcGuaPaMRdnlMQS/hyjV74vU7Y2QsfjgMG98WcB7epo=; b=EtswgNmBGErLnmaQFhA8hiw8nSSARTFxfjYYmnnUFJ8TZTAwkkAClWOzMc2z33Oz1Kch+E EPnjaQc1D6Vv/M/2pAf7wGKSKeFk5tNlqU7clDtGIXFKIe3S4yjdIZKOsgR/e9G6l1Vo2D lI2gku8MTCAT+wnvyNVOTmN+xCDTlYM= 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-628-bNllV1vXPpaHTFsYBK0fJw-1; Mon, 26 Jan 2026 09:30:04 -0500 X-MC-Unique: bNllV1vXPpaHTFsYBK0fJw-1 X-Mimecast-MFC-AGG-ID: bNllV1vXPpaHTFsYBK0fJw_1769437802 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 78BE01944DF2; Mon, 26 Jan 2026 14:30:02 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.44.33.164]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2F8661956053; Mon, 26 Jan 2026 14:29:56 +0000 (UTC) From: David Howells To: Lukas Wunner , Ignat Korchagin Cc: David Howells , Jarkko Sakkinen , Herbert Xu , Eric Biggers , Luis Chamberlain , Petr Pavlu , Daniel Gomez , Sami Tolvanen , "Jason A . Donenfeld" , Ard Biesheuvel , Stephan Mueller , linux-crypto@vger.kernel.org, keyrings@vger.kernel.org, linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v15 3/7] pkcs7, x509: Rename ->digest to ->m Date: Mon, 26 Jan 2026 14:29:24 +0000 Message-ID: <20260126142931.1940586-4-dhowells@redhat.com> In-Reply-To: <20260126142931.1940586-1-dhowells@redhat.com> References: <20260126142931.1940586-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" Rename ->digest and ->digest_len to ->m and ->m_size to represent the input to the signature verification algorithm, reflecting that ->digest may no longer actually *be* a digest. Signed-off-by: David Howells cc: Lukas Wunner cc: Ignat Korchagin cc: Jarkko Sakkinen cc: Stephan Mueller cc: Eric Biggers cc: Herbert Xu cc: keyrings@vger.kernel.org cc: linux-crypto@vger.kernel.org --- crypto/asymmetric_keys/asymmetric_type.c | 4 ++-- crypto/asymmetric_keys/pkcs7_verify.c | 28 ++++++++++++------------ crypto/asymmetric_keys/public_key.c | 3 +-- crypto/asymmetric_keys/signature.c | 2 +- crypto/asymmetric_keys/x509_public_key.c | 10 ++++----- include/crypto/public_key.h | 4 ++-- security/integrity/digsig_asymmetric.c | 4 ++-- 7 files changed, 26 insertions(+), 29 deletions(-) diff --git a/crypto/asymmetric_keys/asymmetric_type.c b/crypto/asymmetric_k= eys/asymmetric_type.c index 348966ea2175..2326743310b1 100644 --- a/crypto/asymmetric_keys/asymmetric_type.c +++ b/crypto/asymmetric_keys/asymmetric_type.c @@ -593,10 +593,10 @@ static int asymmetric_key_verify_signature(struct ker= nel_pkey_params *params, { struct public_key_signature sig =3D { .s_size =3D params->in2_len, - .digest_size =3D params->in_len, + .m_size =3D params->in_len, .encoding =3D params->encoding, .hash_algo =3D params->hash_algo, - .digest =3D (void *)in, + .m =3D (void *)in, .s =3D (void *)in2, }; =20 diff --git a/crypto/asymmetric_keys/pkcs7_verify.c b/crypto/asymmetric_keys= /pkcs7_verify.c index 6d6475e3a9bf..aa085ec6fb1c 100644 --- a/crypto/asymmetric_keys/pkcs7_verify.c +++ b/crypto/asymmetric_keys/pkcs7_verify.c @@ -31,7 +31,7 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7, kenter(",%u,%s", sinfo->index, sinfo->sig->hash_algo); =20 /* The digest was calculated already. */ - if (sig->digest) + if (sig->m) return 0; =20 if (!sinfo->sig->hash_algo) @@ -45,11 +45,11 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7, return (PTR_ERR(tfm) =3D=3D -ENOENT) ? -ENOPKG : PTR_ERR(tfm); =20 desc_size =3D crypto_shash_descsize(tfm) + sizeof(*desc); - sig->digest_size =3D crypto_shash_digestsize(tfm); + sig->m_size =3D crypto_shash_digestsize(tfm); =20 ret =3D -ENOMEM; - sig->digest =3D kmalloc(sig->digest_size, GFP_KERNEL); - if (!sig->digest) + sig->m =3D kmalloc(sig->m_size, GFP_KERNEL); + if (!sig->m) goto error_no_desc; =20 desc =3D kzalloc(desc_size, GFP_KERNEL); @@ -59,11 +59,10 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7, desc->tfm =3D tfm; =20 /* Digest the message [RFC2315 9.3] */ - ret =3D crypto_shash_digest(desc, pkcs7->data, pkcs7->data_len, - sig->digest); + ret =3D crypto_shash_digest(desc, pkcs7->data, pkcs7->data_len, sig->m); if (ret < 0) goto error; - pr_devel("MsgDigest =3D [%*ph]\n", 8, sig->digest); + pr_devel("MsgDigest =3D [%*ph]\n", 8, sig->m); =20 /* However, if there are authenticated attributes, there must be a * message digest attribute amongst them which corresponds to the @@ -78,14 +77,14 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7, goto error; } =20 - if (sinfo->msgdigest_len !=3D sig->digest_size) { + if (sinfo->msgdigest_len !=3D sig->m_size) { pr_warn("Sig %u: Invalid digest size (%u)\n", sinfo->index, sinfo->msgdigest_len); ret =3D -EBADMSG; goto error; } =20 - if (memcmp(sig->digest, sinfo->msgdigest, + if (memcmp(sig->m, sinfo->msgdigest, sinfo->msgdigest_len) !=3D 0) { pr_warn("Sig %u: Message digest doesn't match\n", sinfo->index); @@ -98,7 +97,8 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7, * convert the attributes from a CONT.0 into a SET before we * hash it. */ - memset(sig->digest, 0, sig->digest_size); + memset(sig->m, 0, sig->m_size); + =20 ret =3D crypto_shash_init(desc); if (ret < 0) @@ -108,10 +108,10 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7, if (ret < 0) goto error; ret =3D crypto_shash_finup(desc, sinfo->authattrs, - sinfo->authattrs_len, sig->digest); + sinfo->authattrs_len, sig->m); if (ret < 0) goto error; - pr_devel("AADigest =3D [%*ph]\n", 8, sig->digest); + pr_devel("AADigest =3D [%*ph]\n", 8, sig->m); } =20 error: @@ -138,8 +138,8 @@ int pkcs7_get_digest(struct pkcs7_message *pkcs7, const= u8 **buf, u32 *len, if (ret) return ret; =20 - *buf =3D sinfo->sig->digest; - *len =3D sinfo->sig->digest_size; + *buf =3D sinfo->sig->m; + *len =3D sinfo->sig->m_size; =20 i =3D match_string(hash_algo_name, HASH_ALGO__LAST, sinfo->sig->hash_algo); diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/p= ublic_key.c index e5b177c8e842..a46356e0c08b 100644 --- a/crypto/asymmetric_keys/public_key.c +++ b/crypto/asymmetric_keys/public_key.c @@ -425,8 +425,7 @@ int public_key_verify_signature(const struct public_key= *pkey, if (ret) goto error_free_key; =20 - ret =3D crypto_sig_verify(tfm, sig->s, sig->s_size, - sig->digest, sig->digest_size); + ret =3D crypto_sig_verify(tfm, sig->s, sig->s_size, sig->m, sig->m_size); =20 error_free_key: kfree_sensitive(key); diff --git a/crypto/asymmetric_keys/signature.c b/crypto/asymmetric_keys/si= gnature.c index 041d04b5c953..f4ec126121b3 100644 --- a/crypto/asymmetric_keys/signature.c +++ b/crypto/asymmetric_keys/signature.c @@ -28,7 +28,7 @@ void public_key_signature_free(struct public_key_signatur= e *sig) for (i =3D 0; i < ARRAY_SIZE(sig->auth_ids); i++) kfree(sig->auth_ids[i]); kfree(sig->s); - kfree(sig->digest); + kfree(sig->m); kfree(sig); } } diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_k= eys/x509_public_key.c index 79cc7b7a0630..3854f7ae4ed0 100644 --- a/crypto/asymmetric_keys/x509_public_key.c +++ b/crypto/asymmetric_keys/x509_public_key.c @@ -63,11 +63,11 @@ int x509_get_sig_params(struct x509_certificate *cert) } =20 desc_size =3D crypto_shash_descsize(tfm) + sizeof(*desc); - sig->digest_size =3D crypto_shash_digestsize(tfm); + sig->m_size =3D crypto_shash_digestsize(tfm); =20 ret =3D -ENOMEM; - sig->digest =3D kmalloc(sig->digest_size, GFP_KERNEL); - if (!sig->digest) + sig->m =3D kmalloc(sig->m_size, GFP_KERNEL); + if (!sig->m) goto error; =20 desc =3D kzalloc(desc_size, GFP_KERNEL); @@ -76,9 +76,7 @@ int x509_get_sig_params(struct x509_certificate *cert) =20 desc->tfm =3D tfm; =20 - ret =3D crypto_shash_digest(desc, cert->tbs, cert->tbs_size, - sig->digest); - + ret =3D crypto_shash_digest(desc, cert->tbs, cert->tbs_size, sig->m); if (ret < 0) goto error_2; =20 diff --git a/include/crypto/public_key.h b/include/crypto/public_key.h index 81098e00c08f..bd38ba4d217d 100644 --- a/include/crypto/public_key.h +++ b/include/crypto/public_key.h @@ -43,9 +43,9 @@ extern void public_key_free(struct public_key *key); struct public_key_signature { struct asymmetric_key_id *auth_ids[3]; u8 *s; /* Signature */ - u8 *digest; + u8 *m; /* Message data to pass to verifier */ u32 s_size; /* Number of bytes in signature */ - u32 digest_size; /* Number of bytes in digest */ + u32 m_size; /* Number of bytes in ->m */ const char *pkey_algo; const char *hash_algo; const char *encoding; diff --git a/security/integrity/digsig_asymmetric.c b/security/integrity/di= gsig_asymmetric.c index 457c0a396caf..87be85f477d1 100644 --- a/security/integrity/digsig_asymmetric.c +++ b/security/integrity/digsig_asymmetric.c @@ -121,8 +121,8 @@ int asymmetric_verify(struct key *keyring, const char *= sig, goto out; } =20 - pks.digest =3D (u8 *)data; - pks.digest_size =3D datalen; + pks.m =3D (u8 *)data; + pks.m_size =3D datalen; pks.s =3D hdr->sig; pks.s_size =3D siglen; ret =3D verify_signature(key, &pks);