Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 18:55:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

crypto: ecdsa - Rename keylen to bufsize where necessary

Browse Source 
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>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Stefan Berger 2024-04-04 10:18:53 -04:00 committed by Herbert Xu
parent dee45a607a
commit 703ca5cda1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/ecdsa.c
View File

@ -35,8 +35,8 @@ struct ecdsa_signature_ctx {
static int ecdsa_get_signature_rs(u64 *dest, size_t hdrlen, unsigned char tag, static int ecdsa_get_signature_rs(u64 *dest, size_t hdrlen, unsigned char tag,
const void *value, size_t vlen, unsigned int ndigits) const void *value, size_t vlen, unsigned int ndigits)
{ {
size_t keylen = ndigits * sizeof(u64); size_t bufsize = ndigits * sizeof(u64);
ssize_t diff = vlen - keylen; ssize_t diff = vlen - bufsize;
const char *d = value; const char *d = value;
u8 rs[ECC_MAX_BYTES]; 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) if (diff)
return -EINVAL; return -EINVAL;
} }
if (-diff >= keylen) if (-diff >= bufsize)
return -EINVAL; return -EINVAL;
if (diff) { if (diff) {
@ -138,7 +138,7 @@ static int ecdsa_verify(struct akcipher_request *req)
{ {
struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req); struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);
struct ecc_ctx *ctx = akcipher_tfm_ctx(tfm); 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 = { struct ecdsa_signature_ctx sig_ctx = {
.curve = ctx->curve, .curve = ctx->curve,
}; };
@ -165,14 +165,14 @@ static int ecdsa_verify(struct akcipher_request *req)
goto error; goto error;
/* if the hash is shorter then we will add leading zeros to fit to ndigits */ /* 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 >= 0) {
if (diff) if (diff)
memset(rawhash, 0, diff); memset(rawhash, 0, diff);
memcpy(&rawhash[diff], buffer + req->src_len, req->dst_len); memcpy(&rawhash[diff], buffer + req->src_len, req->dst_len);
} else if (diff < 0) { } else if (diff < 0) {
/* given hash is longer, we take the left-most bytes */ /* 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); ecc_swap_digits((u64 *)rawhash, hash, ctx->curve->g.ndigits);