From: Stefan Berger <stefanb@linux.ibm.com>
To: keyrings@vger.kernel.org, linux-crypto@vger.kernel.org,
herbert@gondor.apana.org.au, davem@davemloft.net
Cc: linux-kernel@vger.kernel.org, saulo.alessandre@tse.jus.br,
lukas@wunner.de, bbhushan2@marvell.com, jarkko@kernel.org,
Stefan Berger <stefanb@linux.ibm.com>
Subject: [PATCH v8 10/13] crypto: ecdsa - Rename keylen to bufsize where necessary
Date: Thu, 4 Apr 2024 10:18:53 -0400 [thread overview]
Message-ID: <20240404141856.2399142-11-stefanb@linux.ibm.com> (raw)
In-Reply-To: <20240404141856.2399142-1-stefanb@linux.ibm.com>
In cases where 'keylen' was referring to the size of the buffer used by
a curve's digits, it does not reflect the purpose of the variable anymore
once NIST P521 is used. What it refers to then is the size of the buffer,
which may be a few bytes larger than the size a coordinate of a key.
Therefore, rename keylen to bufsize where appropriate.
Tested-by: Lukas Wunner <lukas@wunner.de>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
crypto/ecdsa.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/crypto/ecdsa.c b/crypto/ecdsa.c
index 75d3eea885db..c7923f30661b 100644
--- a/crypto/ecdsa.c
+++ b/crypto/ecdsa.c
@@ -35,8 +35,8 @@ struct ecdsa_signature_ctx {
static int ecdsa_get_signature_rs(u64 *dest, size_t hdrlen, unsigned char tag,
const void *value, size_t vlen, unsigned int ndigits)
{
- size_t keylen = ndigits * sizeof(u64);
- ssize_t diff = vlen - keylen;
+ size_t bufsize = ndigits * sizeof(u64);
+ ssize_t diff = vlen - bufsize;
const char *d = value;
u8 rs[ECC_MAX_BYTES];
@@ -58,7 +58,7 @@ static int ecdsa_get_signature_rs(u64 *dest, size_t hdrlen, unsigned char tag,
if (diff)
return -EINVAL;
}
- if (-diff >= keylen)
+ if (-diff >= bufsize)
return -EINVAL;
if (diff) {
@@ -138,7 +138,7 @@ static int ecdsa_verify(struct akcipher_request *req)
{
struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);
struct ecc_ctx *ctx = akcipher_tfm_ctx(tfm);
- size_t keylen = ctx->curve->g.ndigits * sizeof(u64);
+ size_t bufsize = ctx->curve->g.ndigits * sizeof(u64);
struct ecdsa_signature_ctx sig_ctx = {
.curve = ctx->curve,
};
@@ -165,14 +165,14 @@ static int ecdsa_verify(struct akcipher_request *req)
goto error;
/* if the hash is shorter then we will add leading zeros to fit to ndigits */
- diff = keylen - req->dst_len;
+ diff = bufsize - req->dst_len;
if (diff >= 0) {
if (diff)
memset(rawhash, 0, diff);
memcpy(&rawhash[diff], buffer + req->src_len, req->dst_len);
} else if (diff < 0) {
/* given hash is longer, we take the left-most bytes */
- memcpy(&rawhash, buffer + req->src_len, keylen);
+ memcpy(&rawhash, buffer + req->src_len, bufsize);
}
ecc_swap_digits((u64 *)rawhash, hash, ctx->curve->g.ndigits);
--
2.43.0
next prev parent reply other threads:[~2024-04-04 14:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-04 14:18 [PATCH v8 00/13] Add support for NIST P521 to ecdsa Stefan Berger
2024-04-04 14:18 ` [PATCH v8 01/13] crypto: ecc - Use ECC_CURVE_NIST_P192/256/384_DIGITS where possible Stefan Berger
2024-04-04 14:18 ` [PATCH v8 02/13] crypto: ecdsa - Convert byte arrays with key coordinates to digits Stefan Berger
2024-04-04 14:18 ` [PATCH v8 03/13] crypto: ecdsa - Adjust tests on length of key parameters Stefan Berger
2024-04-04 14:18 ` [PATCH v8 04/13] crypto: ecdsa - Extend res.x mod n calculation for NIST P521 Stefan Berger
2024-04-04 14:18 ` [PATCH v8 05/13] crypto: ecc - Add nbits field to ecc_curve structure Stefan Berger
2024-04-04 14:40 ` Vitaly Chikunov
2024-04-04 14:18 ` [PATCH v8 06/13] crypto: ecc - Implement vli_mmod_fast_521 for NIST p521 Stefan Berger
2024-04-04 14:18 ` [PATCH v8 07/13] crypto: ecc - Add special case for NIST P521 in ecc_point_mult Stefan Berger
2024-04-04 14:18 ` [PATCH v8 08/13] crypto: ecc - Add NIST P521 curve parameters Stefan Berger
2024-04-04 14:18 ` [PATCH v8 09/13] crypto: ecdsa - Replace ndigits with nbits where precision is needed Stefan Berger
2024-04-04 14:18 ` Stefan Berger [this message]
2024-04-04 14:18 ` [PATCH v8 11/13] crypto: ecdsa - Register NIST P521 and extend test suite Stefan Berger
2024-04-04 14:18 ` [PATCH v8 12/13] crypto: asymmetric_keys - Adjust signature size calculation for NIST P521 Stefan Berger
2024-04-04 14:18 ` [PATCH v8 13/13] crypto: x509 - Add OID for NIST P521 and extend parser for it Stefan Berger
2024-04-04 16:33 ` [PATCH v8 00/13] Add support for NIST P521 to ecdsa Lukas Wunner
2024-04-12 7:31 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240404141856.2399142-11-stefanb@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=bbhushan2@marvell.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=jarkko@kernel.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=saulo.alessandre@tse.jus.br \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox