Skip to content

Commit 9187d58

Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: read EC curve metadata directly
Avoid reconstructing EC keys for key details and TLS ephemeral-key curve reporting. Assisted-by: GitHub Copilot Signed-off-by: Filip Skokan <panva.ip@gmail.com> PR-URL: #65908 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
1 parent bf534f6 commit 9187d58

5 files changed

Lines changed: 44 additions & 9 deletions

File tree

‎benchmark/crypto/ec-key-details.js‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
'use strict';
2+
3+
const common = require('../common.js');
4+
const { KeyObject } = require('crypto');
5+
6+
const bench = common.createBenchmark(main, {
7+
namedCurve: ['P-256', 'P-384', 'P-521'],
8+
type: ['public', 'private'],
9+
n: [10000],
10+
});
11+
12+
async function main({ namedCurve, type, n }) {
13+
const pair = await crypto.subtle.generateKey({
14+
name: 'ECDSA', namedCurve,
15+
}, true, ['sign', 'verify']);
16+
const cryptoKey = pair[`${type}Key`];
17+
bench.start();
18+
for (let index = 0; index < n; index++) {
19+
if (!KeyObject.from(cryptoKey).asymmetricKeyDetails.namedCurve)
20+
throw new Error('Missing named curve');
21+
}
22+
bench.end(n);
23+
}

‎deps/ncrypto/ncrypto.cc‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6916,6 +6916,24 @@ int Ec::getCurve() const {
69166916
return EC_GROUP_get_curve_name(getGroup());
69176917
}
69186918

6919+
int Ec::GetCurveId(const EVPKeyPointer& key) {
6920+
#if NCRYPTO_USE_OPENSSL3_PROVIDER
6921+
char name[80];
6922+
size_t length = 0;
6923+
if (EVP_PKEY_get_utf8_string_param(
6924+
key.get(), OSSL_PKEY_PARAM_GROUP_NAME, name, sizeof(name), &length) !=
6925+
1) {
6926+
return NID_undef;
6927+
}
6928+
return GetCurveIdFromName(name);
6929+
#else
6930+
const EC_KEY* ec = key;
6931+
if (ec == nullptr) return NID_undef;
6932+
const EC_GROUP* group = EC_KEY_get0_group(ec);
6933+
return group == nullptr ? NID_undef : EC_GROUP_get_curve_name(group);
6934+
#endif
6935+
}
6936+
69196937
int Ec::GetCurveIdFromName(const char* name) {
69206938
int nid = EC_curve_nist2nid(name);
69216939
if (nid == NID_undef) {

‎deps/ncrypto/ncrypto.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,7 @@ class Ec final {
812812
#endif
813813

814814
static int GetCurveIdFromName(const char* name);
815+
static int GetCurveId(const EVPKeyPointer& key);
815816

816817
using GetCurveCallback = std::function<bool(const char*)>;
817818
static bool GetCurves(GetCurveCallback callback);

‎src/crypto/crypto_common.cc‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
namespace node {
2929

3030
using ncrypto::ClearErrorOnReturn;
31-
using ncrypto::ECKeyPointer;
3231
using ncrypto::EVPKeyPointer;
3332
using ncrypto::SSLPointer;
3433
using ncrypto::SSLSessionPointer;
@@ -231,9 +230,7 @@ MaybeLocal<Object> GetEphemeralKey(Environment* env, const SSLPointer& ssl) {
231230
case EVP_PKEY_X448: {
232231
const char* curve_name;
233232
if (kid == EVP_PKEY_EC) {
234-
ECKeyPointer ec(key);
235-
if (!ec) break;
236-
int nid = EC_GROUP_get_curve_name(ec.getGroup());
233+
int nid = ncrypto::Ec::GetCurveId(key);
237234
if (nid == NID_undef) break;
238235
curve_name = OBJ_nid2sn(nid);
239236
} else {

‎src/crypto/crypto_ec.cc‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -896,11 +896,7 @@ bool GetEcKeyDetail(Environment* env,
896896
const auto& m_pkey = key.GetAsymmetricKey();
897897
CHECK_EQ(m_pkey.id(), EVP_PKEY_EC);
898898

899-
ECKeyPointer ec(m_pkey);
900-
if (!ec) return true;
901-
902-
const auto group = ec.getGroup();
903-
int nid = EC_GROUP_get_curve_name(group);
899+
int nid = Ec::GetCurveId(m_pkey);
904900
if (nid == NID_undef) return true;
905901

906902
return target

0 commit comments

Comments
 (0)