Visitar URL original
crypto: skip private RSA parameters in key details · nodejs/node@ef957ac · GitHub
Skip to content

Commit ef957ac

Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: skip private RSA parameters in key details
Retrieving asymmetricKeyDetails only needs the modulus, public exponent, and RSA-PSS restrictions. Add a public-only Rsa view so provider-backed keys do not also extract private components or probe additional primes. Signed-off-by: Filip Skokan <panva.ip@gmail.com> Assisted-by: Codex PR-URL: #66108 Backport-PR-URL: #66233 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 8feccc5 commit ef957ac

4 files changed

Lines changed: 50 additions & 20 deletions

File tree

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
'use strict';
2+
3+
const common = require('../common.js');
4+
const { KeyObject } = require('crypto');
5+
6+
const bench = common.createBenchmark(main, {
7+
type: ['public', 'private'],
8+
n: [10000],
9+
});
10+
11+
async function main({ type, n }) {
12+
const pair = await crypto.subtle.generateKey({
13+
name: 'RSA-PSS',
14+
modulusLength: 2048,
15+
publicExponent: new Uint8Array([1, 0, 1]),
16+
hash: 'SHA-256',
17+
}, true, ['sign', 'verify']);
18+
const cryptoKey = pair[`${type}Key`];
19+
// Use a fresh KeyObject so each iteration retrieves uncached key details.
20+
bench.start();
21+
for (let index = 0; index < n; index++) {
22+
if (KeyObject.from(cryptoKey).asymmetricKeyDetails.modulusLength !== 2048)
23+
throw new Error('Unexpected modulus length');
24+
}
25+
bench.end(n);
26+
}

‎deps/ncrypto/ncrypto.cc‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6827,13 +6827,22 @@ ASN1StringPointer EncodeRsaPssParams(const Rsa::PssParams& params) {
68276827

68286828
Rsa::Rsa() : rsa_(false) {}
68296829

6830-
Rsa::Rsa(const EVP_PKEY* pkey) : Rsa() {
6830+
Rsa::Rsa(const EVP_PKEY* pkey, Selection selection) : Rsa() {
68316831
rsa_pss_ = EVPKeyPointer::isA(pkey, KeyAlgorithm::RSA_PSS);
68326832
if (!EVPKeyPointer::isA(pkey, KeyAlgorithm::RSA) && !rsa_pss_) return;
68336833
if (!GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_N, &n_) ||
68346834
!GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_E, &e_)) {
68356835
return;
68366836
}
6837+
if (rsa_pss_) {
6838+
MarkPopErrorOnReturn pop_errors;
6839+
PssParams params;
6840+
if (ReadRsaPssParams(pkey, &params)) pss_params_ = params;
6841+
}
6842+
if (selection == Selection::Public) {
6843+
rsa_ = true;
6844+
return;
6845+
}
68376846
if (!GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_D, &d_) ||
68386847
!GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &p_) ||
68396848
!GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2, &q_) ||
@@ -6856,19 +6865,21 @@ Rsa::Rsa(const EVP_PKEY* pkey) : Rsa() {
68566865
other_prime_infos_.push_back(std::move(info));
68576866
}
68586867

6859-
if (rsa_pss_) {
6860-
MarkPopErrorOnReturn pop_errors;
6861-
PssParams params;
6862-
if (ReadRsaPssParams(pkey, &params)) pss_params_ = params;
6863-
}
6864-
68656868
rsa_ = true;
68666869
}
68676870
#else
68686871
Rsa::Rsa() : rsa_(nullptr) {}
68696872
Rsa::Rsa(OSSL3_CONST RSA* ptr) : rsa_(ptr) {}
68706873
#endif
68716874

6875+
Rsa Rsa::PublicOnly(const EVPKeyPointer& key) {
6876+
#if NCRYPTO_USE_OPENSSL3_PROVIDER
6877+
return Rsa(key.get(), Selection::Public);
6878+
#else
6879+
return key;
6880+
#endif
6881+
}
6882+
68726883
const Rsa::PublicKey Rsa::getPublicKey() const {
68736884
#if NCRYPTO_USE_OPENSSL3_PROVIDER
68746885
if (!rsa_) return {};

‎deps/ncrypto/ncrypto.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,8 +650,10 @@ class Dsa final {
650650
class Rsa final {
651651
public:
652652
Rsa();
653+
enum class Selection { Public, Private };
654+
static Rsa PublicOnly(const EVPKeyPointer& key);
653655
#if NCRYPTO_USE_OPENSSL3_PROVIDER
654-
explicit Rsa(const EVP_PKEY* pkey);
656+
explicit Rsa(const EVP_PKEY* pkey, Selection selection = Selection::Private);
655657
#else
656658
Rsa(OSSL3_CONST RSA* rsa);
657659
#endif

‎src/crypto/crypto_rsa.cc‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -572,9 +572,7 @@ bool GetRsaKeyDetail(Environment* env,
572572
Mutex::ScopedLock lock(key.mutex());
573573
const auto& m_pkey = key.GetAsymmetricKey();
574574

575-
// TODO(tniessen): Remove the "else" branch once we drop support for OpenSSL
576-
// versions older than 1.1.1e via FIPS / dynamic linking.
577-
const ncrypto::Rsa rsa = m_pkey;
575+
const auto rsa = ncrypto::Rsa::PublicOnly(m_pkey);
578576
if (!rsa) return false;
579577

580578
auto pub_key = rsa.getPublicKey();
@@ -608,15 +606,8 @@ bool GetRsaKeyDetail(Environment* env,
608606
}
609607

610608
if (m_pkey.isA(KeyAlgorithm::RSA_PSS)) {
611-
// Due to the way ASN.1 encoding works, default values are omitted when
612-
// encoding the data structure. However, there are also RSA-PSS keys for
613-
// which no parameters are set. In that case, the ASN.1 RSASSA-PSS-params
614-
// sequence will be missing entirely and RSA_get0_pss_params will return
615-
// nullptr. If parameters are present but all parameters are set to their
616-
// default values, an empty sequence will be stored in the ASN.1 structure.
617-
// In that case, RSA_get0_pss_params does not return nullptr but all fields
618-
// of the returned RSA_PSS_PARAMS will be set to nullptr.
619-
609+
// An absent RSASSA-PSS-params sequence means the key is unrestricted.
610+
// An empty sequence restricts the key to the default parameter values.
620611
auto maybe_params = rsa.getPssParams();
621612
if (maybe_params.has_value()) {
622613
auto& params = maybe_params.value();

0 commit comments

Comments
 (0)