From 4e12830c92f6c50364a4883d48e26e45714d85e2 Mon Sep 17 00:00:00 2001 From: tb <> Date: Tue, 18 Feb 2025 06:31:10 +0000 Subject: pkey_ec_derive(): simplify keylen calculation ok jsing --- src/lib/libcrypto/ec/ec_pmeth.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib/libcrypto/ec/ec_pmeth.c b/src/lib/libcrypto/ec/ec_pmeth.c index 6d74a7f8a4..e1a068d62d 100644 --- a/src/lib/libcrypto/ec/ec_pmeth.c +++ b/src/lib/libcrypto/ec/ec_pmeth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_pmeth.c,v 1.24 2025/01/05 16:07:08 tb Exp $ */ +/* $OpenBSD: ec_pmeth.c,v 1.25 2025/02/18 06:31:10 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -221,10 +221,8 @@ pkey_ec_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen) } eckey = dctx->co_key ? dctx->co_key : ctx->pkey->pkey.ec; - if (!key) { - const EC_GROUP *group; - group = EC_KEY_get0_group(eckey); - *keylen = (EC_GROUP_get_degree(group) + 7) / 8; + if (key == NULL) { + *keylen = BN_num_bytes(eckey->group->p); return 1; } pubkey = EC_KEY_get0_public_key(ctx->peerkey->pkey.ec); -- cgit v1.2.3-55-g6feb