Commit b65a8f3

Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: preserve RSA-PSS legacy pubkey DER
Recreate the historical rsaEncryption AlgorithmIdentifier used by X509Certificate legacy pubkey output for restricted and unrestricted RSA-PSS keys without relying on deprecated RSA APIs. Signed-off-by: Filip Skokan <panva.ip@gmail.com> PR-URL: #64547 Backport-PR-URL: #65087 Refs: #64211 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 49f2ae2 commit b65a8f3

6 files changed

Lines changed: 182 additions & 1 deletion

File tree

‎deps/ncrypto/ncrypto.cc‎

Lines changed: 94 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9393
}
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
96+
using ASN1StringPointer = DeleteFnPtr<ASN1_STRING, ASN1_STRING_free>;
9697
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
98+
using RsaPssParamsPointer = DeleteFnPtr<RSA_PSS_PARAMS, RSA_PSS_PARAMS_free>;
99+
using X509AlgorPointer = DeleteFnPtr<X509_ALGOR, X509_ALGOR_free>;
100+
using X509PubkeyPointer = DeleteFnPtr<X509_PUBKEY, X509_PUBKEY_free>;
97101
structOSSLParamDeleter {
98102
voidoperator()(OSSL_PARAM* params) const {
99103
if (params == nullptr) return;
@@ -5702,13 +5706,74 @@ bool ReadRsaPssParams(const EVP_PKEY* pkey, Rsa::PssParams* params) {
57025706

57035707
returntrue;
57045708
}
5709+
5710+
boolSetRsaPssHashAlgorithm(X509_ALGOR** out, const Digest& digest) {
5711+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5712+
5713+
X509AlgorPointer algorithm(X509_ALGOR_new());
5714+
if (!algorithm) returnfalse;
5715+
X509_ALGOR_set_md(algorithm.get(), digest.get());
5716+
*out = algorithm.release();
5717+
returntrue;
5718+
}
5719+
5720+
boolSetRsaPssMaskGenAlgorithm(X509_ALGOR** out, const Digest& digest) {
5721+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5722+
5723+
X509AlgorPointer hash_algorithm(X509_ALGOR_new());
5724+
if (!hash_algorithm) returnfalse;
5725+
X509_ALGOR_set_md(hash_algorithm.get(), digest.get());
5726+
5727+
ASN1StringPointer hash_algorithm_der(ASN1_item_pack(
5728+
hash_algorithm.get(), ASN1_ITEM_rptr(X509_ALGOR), nullptr));
5729+
if (!hash_algorithm_der) returnfalse;
5730+
5731+
X509AlgorPointer algorithm(X509_ALGOR_new());
5732+
if (!algorithm || X509_ALGOR_set0(algorithm.get(),
5733+
OBJ_nid2obj(NID_mgf1),
5734+
V_ASN1_SEQUENCE,
5735+
hash_algorithm_der.get()) != 1) {
5736+
returnfalse;
5737+
}
5738+
hash_algorithm_der.release();
5739+
*out = algorithm.release();
5740+
returntrue;
5741+
}
5742+
5743+
ASN1StringPointer EncodeRsaPssParams(const Rsa::PssParams& params) {
5744+
const Digest digest = Digest::FromName(params.digest.data());
5745+
if (!digest) return {};
5746+
5747+
const Digest mgf1_digest = params.mgf1_digest
5748+
? Digest::FromName(params.mgf1_digest->data())
5749+
: digest;
5750+
if (!mgf1_digest) return {};
5751+
5752+
RsaPssParamsPointer pss(RSA_PSS_PARAMS_new());
5753+
if (!pss || !SetRsaPssHashAlgorithm(&pss->hashAlgorithm, digest) ||
5754+
!SetRsaPssMaskGenAlgorithm(&pss->maskGenAlgorithm, mgf1_digest)) {
5755+
return {};
5756+
}
5757+
5758+
if (params.salt_length != 20) {
5759+
pss->saltLength = ASN1_INTEGER_new();
5760+
if (pss->saltLength == nullptr ||
5761+
ASN1_INTEGER_set_int64(pss->saltLength, params.salt_length) != 1) {
5762+
return {};
5763+
}
5764+
}
5765+
5766+
returnASN1StringPointer(
5767+
ASN1_item_pack(pss.get(), ASN1_ITEM_rptr(RSA_PSS_PARAMS), nullptr));
5768+
}
57055769
} // namespace
57065770

57075771
Rsa::Rsa() : rsa_(false) {}
57085772

57095773
Rsa::Rsa(constEVP_PKEY* pkey) : Rsa() {
57105774
constint type = EVPKeyPointer::id(pkey);
57115775
if (type != EVP_PKEY_RSA && type != EVP_PKEY_RSA_PSS) return;
5776+
rsa_pss_ = type == EVP_PKEY_RSA_PSS;
57125777
if (!GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_N, &n_) ||
57135778
!GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_E, &e_)) {
57145779
return;
@@ -5804,7 +5869,35 @@ BIOPointer Rsa::derPublicKey() const {
58045869
if (!bio) return {};
58055870
#if NCRYPTO_USE_OPENSSL3_PROVIDER
58065871
auto pkey = EVPKeyPointer::NewRSA(*this);
5807-
if (!pkey || i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5872+
if (!pkey) return {};
5873+
if (!rsa_pss_) {
5874+
if (i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5875+
return bio;
5876+
}
5877+
5878+
X509_PUBKEY* raw_pubkey = nullptr;
5879+
constint result = X509_PUBKEY_set(&raw_pubkey, pkey.get());
5880+
X509PubkeyPointer pubkey(raw_pubkey);
5881+
if (result != 1) return {};
5882+
5883+
int parameter_type = V_ASN1_UNDEF;
5884+
ASN1StringPointer parameters;
5885+
if (pss_params_) {
5886+
parameters = EncodeRsaPssParams(*pss_params_);
5887+
if (!parameters) return {};
5888+
parameter_type = V_ASN1_SEQUENCE;
5889+
}
5890+
5891+
if (X509_PUBKEY_set0_param(pubkey.get(),
5892+
OBJ_nid2obj(NID_rsaEncryption),
5893+
parameter_type,
5894+
parameters.get(),
5895+
nullptr,
5896+
0) != 1) {
5897+
return {};
5898+
}
5899+
parameters.release();
5900+
if (i2d_X509_PUBKEY_bio(bio.get(), pubkey.get()) != 1) return {};
58085901
#else
58095902
if (rsa_ == nullptr || i2d_RSA_PUBKEY_bio(bio.get(), rsa_) != 1) return {};
58105903
#endif

‎deps/ncrypto/ncrypto.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,7 @@ class Rsa final {
639639
private:
640640
#if NCRYPTO_USE_OPENSSL3_PROVIDER
641641
bool rsa_ = false;
642+
bool rsa_pss_ = false;
642643
DeleteFnPtr<BIGNUM, BN_free> n_;
643644
DeleteFnPtr<BIGNUM, BN_free> e_;
644645
DeleteFnPtr<BIGNUM, BN_clear_free> d_;

‎test/fixtures/keys/Makefile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ all: \
7171
rsa_private_4096.pem \
7272
rsa_public_2048.pem \
7373
rsa_public_4096.pem \
74+
rsa_pss_cert_2048.pem \
75+
rsa_pss_cert_2048_sha256_sha256_16.pem \
7476
rsa_pss_private_2048.pem \
7577
rsa_pss_private_2048_sha256_sha256_16.pem \
7678
rsa_pss_private_2048_sha512_sha256_20.pem \
@@ -918,6 +920,12 @@ rsa_pss_private_2048_sha512_sha256_20.pem:
918920
rsa_pss_private_2048_sha1_sha1_20.pem:
919921
openssl genpkey -algorithm RSA-PSS -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 -pkeyopt rsa_pss_keygen_md:sha1 -pkeyopt rsa_pss_keygen_mgf1_md:sha1 -pkeyopt rsa_pss_keygen_saltlen:20 -out rsa_pss_private_2048_sha1_sha1_20.pem
920922

923+
rsa_pss_cert_2048.pem: rsa_pss_private_2048.pem
924+
openssl req -new -x509 -key rsa_pss_private_2048.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048.pem
925+
926+
rsa_pss_cert_2048_sha256_sha256_16.pem: rsa_pss_private_2048_sha256_sha256_16.pem
927+
openssl req -new -x509 -key rsa_pss_private_2048_sha256_sha256_16.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048_sha256_sha256_16.pem
928+
921929
rsa_pss_public_2048.pem: rsa_pss_private_2048.pem
922930
openssl pkey -in rsa_pss_private_2048.pem -pubout -out rsa_pss_public_2048.pem
923931

‎test/fixtures/keys/rsa_pss_cert_2048.pem‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDWjCCAg6gAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCASAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjE4MzJaGA8yMTI2MDYyMjIyMTgzMlowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCASAwCwYJKoZIhvcNAQEKA4IBDwAwggEKAoIBAQDLg4x1
6+
Lzg+WAjkJEtt1u531G7u+msWvZg01SZ1PsPdiACmK/wKPMpcuJUOdswRP6XCa1qD
7+
8RxmzFUIqi+y7fSlgBIGuIc6IxVi6L35lomhD3IjqU6MbVFu5QElc1KMcEnGoGqZ
8+
yBk5vWZ1Gv95fOkAxYneF+4uiNTb7NRInf+u96l6lwsUbar2cDT48myQns+eHcvT
9+
J2e/dTeF24yfk5V+b8nHUU/JmkPXzi0l9/434xjezeEhx+46cv0+XhE8Z5pMLhPW
10+
jjrQ1obpsbtzZaGDo05pWBoUhqI1utNM0KlWN5PJqWxNdiVBDeGIqOy3RDul8USQ
11+
kOjyqKotp3UyyXn3AgMBAAGjUzBRMB0GA1UdDgQWBBQDCGflRn9LTmklPpSFii4J
12+
fQiQjTAfBgNVHSMEGDAWgBQDCGflRn9LTmklPpSFii4JfQiQjTAPBgNVHRMBAf8E
13+
BTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG
14+
9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIAOCAQEAsXJk8iu+XNSmIheNPvzfSoNp
15+
7kkFqFjWRwo/a4vXb4Y7DRDsMeUM4dGNtN75Gj5bppnYtQ3ku/DWGLrVRPGs/sRx
16+
itOJxvJzPNCv4yYUwm8p8ua7l1Sdmrder84XTG/Dm3dOoUOxCmEQzzjghXE0mRih
17+
UC4aPyOGNHNlQg5YyEmfEnltlL12ls8cHE+5R56xeI34T/MukH0NVf7wNNfqrMqy
18+
PrrXG79+D3+Jeu3ddtwvoKQyQ/VuszJGjdplkDodttyTfu3GOgC/bbR9iz2GkcTV
19+
NEkjJHenMzpoAoNZukeuClOHF6NT3hBnKPmcZYlLPgIY1iOBYoGwctgb5pPxNg==
20+
-----END CERTIFICATE-----

‎test/fixtures/keys/rsa_pss_cert_2048_sha256_sha256_16.pem‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDkDCCAkSgAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCARAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjAyMzVaGA8yMTI2MDYyMjIyMDIzNVowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCAVYwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgEF
6+
AKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQMEAgEFAKIDAgEQA4IBDwAwggEKAoIB
7+
AQDfqNM4C+QtD73iILqOkqfV8ha3O19jpX8UujIk1Z72bbbuwEzh0+sBw0dD0N8C
8+
gkXnePOEEd6q7HNmbyCNqRpDK6NDvaCMDWgEaD/PlHkRntvKh81IXSMC5imjRfOc
9+
ZIE/Gnw7h8tanab0n75+ODvLJrmEWUG2q79Im1mWMx7Spod+Np6XEY+7I7nAUUWi
10+
vr35Yx5DeyxY8rxFGpsLtGsi7JNQO4aHyeBpj8tz0Fhv23uPywE2nGmPHfnkXWbr
11+
TcHGbzYBgEbeSH9KUkRwczqDXNOPhtfaEHEFTm0MoeKCnJe1VOjSywev77dV1KZf
12+
pVh3Kh0ZRQIe9YOVJhj4lMx3AgMBAAGjUzBRMB0GA1UdDgQWBBRrGC6N4gEM/Il9
13+
PMkKs+dhCbldkjAfBgNVHSMEGDAWgBRrGC6N4gEM/Il9PMkKs+dhCbldkjAPBgNV
14+
HRMBAf8EBTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAa
15+
BgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBEAOCAQEA1SP4HNSgQm2OpuRb
16+
VjEDyVANpCyuKjUFY0FAwart4YSKHwERuR5VccugGwlbnH0vKQ2uwTB/a5BlXssg
17+
0KB8qjDoOoxzhgZTA7yuHuQLpgCQhd00ORpxFYI1CyB+HywrpbuV4LHJoZjO7B6O
18+
Z0PPRs77023WkT/O4KRrFH8uaMgPMwUIjIGXzSp+TYObLnYTWmGyJ7rJVwOPH30z
19+
+BY++W0ZhkCuJveajuF3vGpA4o/lA0kcf6Hz2Prl28kHu0hOpZNTx2zMl+GFtlWE
20+
TIybjAvbA4TJW0rAURRuP4lhYsPJAnZDAnxHFvLeLKypfctv7eAc82U8rVjT+DIA
21+
NjayPQ==
22+
-----END CERTIFICATE-----

‎test/parallel/test-crypto-x509.js‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ if (!common.hasCrypto)
77

88
const{
99
X509Certificate,
10+
createHash,
1011
createPrivateKey,
1112
generateKeyPairSync,
1213
createSign,
@@ -27,6 +28,42 @@ const ca = readFileSync(fixtures.path('keys', 'ca1-cert.pem'));
2728

2829
constprivateKey=createPrivateKey(key);
2930

31+
if(!process.features.openssl_is_boringssl){
32+
constexpectedPubkeys=hasOpenSSL3 ? [
33+
[
34+
'rsa_pss_cert_2048.pem',
35+
292,
36+
'dff998a209bfa2e6ded1208c6e57f5b6bdedfa44b631265e3e244f38e637f6e4',
37+
],
38+
[
39+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
40+
342,
41+
'da0bcd53fbe3969c7cc2730f86abc34e0e1c340264bbdfa3faf01484c2eeece0',
42+
],
43+
] : [
44+
[
45+
'rsa_pss_cert_2048.pem',
46+
294,
47+
'4d4f2f076aced4f0df922b84b466b0a60ba4cb50a23d695ae12ddc5fff7aca14',
48+
],
49+
[
50+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
51+
294,
52+
'd37942c3bd02bc25c724fcd31efd647824e536c13d62d9ad0b5db8c0900d3cba',
53+
],
54+
];
55+
56+
for(const[name,length,digest]ofexpectedPubkeys){
57+
constpssCert=newX509Certificate(
58+
readFileSync(fixtures.path('keys',name)));
59+
constpubkey=pssCert.toLegacyObject().pubkey;
60+
assert.strictEqual(pubkey.length,length);
61+
assert.strictEqual(
62+
createHash('sha256').update(pubkey).digest('hex'),
63+
digest);
64+
}
65+
}
66+
3067
[1,{},false,null].forEach((i)=>{
3168
assert.throws(()=>newX509Certificate(i),{
3269
code: 'ERR_INVALID_ARG_TYPE'

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit b65a8f3
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: preserve RSA-PSS legacy pubkey DER
Recreate the historical rsaEncryption AlgorithmIdentifier used by
X509Certificate legacy pubkey output for restricted and unrestricted
RSA-PSS keys without relying on deprecated RSA APIs.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #64547
Backport-PR-URL: #65087
Refs: #64211
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 49f2ae2 commit b65a8f3
6 files changed
Lines changed: 182 additions & 1 deletion
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 94 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9393
}
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
96+
using ASN1StringPointer = DeleteFnPtr<ASN1_STRING, ASN1_STRING_free>;
9697
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
98+
using RsaPssParamsPointer = DeleteFnPtr<RSA_PSS_PARAMS, RSA_PSS_PARAMS_free>;
99+
using X509AlgorPointer = DeleteFnPtr<X509_ALGOR, X509_ALGOR_free>;
100+
using X509PubkeyPointer = DeleteFnPtr<X509_PUBKEY, X509_PUBKEY_free>;
97101
structOSSLParamDeleter {
98102
voidoperator()(OSSL_PARAM* params) const {
99103
if (params == nullptr) return;
@@ -5702,13 +5706,74 @@ bool ReadRsaPssParams(const EVP_PKEY* pkey, Rsa::PssParams* params) {
57025706

57035707
returntrue;
57045708
}
5709+
5710+
boolSetRsaPssHashAlgorithm(X509_ALGOR** out, const Digest& digest) {
5711+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5712+
5713+
 X509AlgorPointer algorithm(X509_ALGOR_new());
5714+
if (!algorithm) returnfalse;
5715+
X509_ALGOR_set_md(algorithm.get(), digest.get());
5716+
 *out = algorithm.release();
5717+
returntrue;
5718+
}
5719+
5720+
boolSetRsaPssMaskGenAlgorithm(X509_ALGOR** out, const Digest& digest) {
5721+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5722+
5723+
 X509AlgorPointer hash_algorithm(X509_ALGOR_new());
5724+
if (!hash_algorithm) returnfalse;
5725+
X509_ALGOR_set_md(hash_algorithm.get(), digest.get());
5726+
5727+
 ASN1StringPointer hash_algorithm_der(ASN1_item_pack(
5728+
 hash_algorithm.get(), ASN1_ITEM_rptr(X509_ALGOR), nullptr));
5729+
if (!hash_algorithm_der) returnfalse;
5730+
5731+
 X509AlgorPointer algorithm(X509_ALGOR_new());
5732+
if (!algorithm || X509_ALGOR_set0(algorithm.get(),
5733+
OBJ_nid2obj(NID_mgf1),
5734+
V_ASN1_SEQUENCE,
5735+
 hash_algorithm_der.get()) != 1) {
5736+
returnfalse;
5737+
 }
5738+
 hash_algorithm_der.release();
5739+
 *out = algorithm.release();
5740+
returntrue;
5741+
}
5742+
5743+
ASN1StringPointer EncodeRsaPssParams(const Rsa::PssParams& params) {
5744+
const Digest digest = Digest::FromName(params.digest.data());
5745+
if (!digest) return {};
5746+
5747+
const Digest mgf1_digest = params.mgf1_digest
5748+
 ? Digest::FromName(params.mgf1_digest->data())
5749+
 : digest;
5750+
if (!mgf1_digest) return {};
5751+
5752+
 RsaPssParamsPointer pss(RSA_PSS_PARAMS_new());
5753+
if (!pss || !SetRsaPssHashAlgorithm(&pss->hashAlgorithm, digest) ||
5754+
 !SetRsaPssMaskGenAlgorithm(&pss->maskGenAlgorithm, mgf1_digest)) {
5755+
return {};
5756+
 }
5757+
5758+
if (params.salt_length != 20) {
5759+
 pss->saltLength = ASN1_INTEGER_new();
5760+
if (pss->saltLength == nullptr ||
5761+
ASN1_INTEGER_set_int64(pss->saltLength, params.salt_length) != 1) {
5762+
return {};
5763+
 }
5764+
 }
5765+
5766+
returnASN1StringPointer(
5767+
ASN1_item_pack(pss.get(), ASN1_ITEM_rptr(RSA_PSS_PARAMS), nullptr));
5768+
}
57055769
} // namespace
57065770

57075771
Rsa::Rsa() : rsa_(false) {}
57085772

57095773
Rsa::Rsa(constEVP_PKEY* pkey) : Rsa() {
57105774
constint type = EVPKeyPointer::id(pkey);
57115775
if (type != EVP_PKEY_RSA && type != EVP_PKEY_RSA_PSS) return;
5776+
 rsa_pss_ = type == EVP_PKEY_RSA_PSS;
57125777
if (!GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_N, &n_) ||
57135778
 !GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_E, &e_)) {
57145779
return;
@@ -5804,7 +5869,35 @@ BIOPointer Rsa::derPublicKey() const {
58045869
if (!bio) return {};
58055870
#if NCRYPTO_USE_OPENSSL3_PROVIDER
58065871
auto pkey = EVPKeyPointer::NewRSA(*this);
5807-
if (!pkey || i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5872+
if (!pkey) return {};
5873+
if (!rsa_pss_) {
5874+
if (i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5875+
return bio;
5876+
 }
5877+
5878+
X509_PUBKEY* raw_pubkey = nullptr;
5879+
constint result = X509_PUBKEY_set(&raw_pubkey, pkey.get());
5880+
 X509PubkeyPointer pubkey(raw_pubkey);
5881+
if (result != 1) return {};
5882+
5883+
int parameter_type = V_ASN1_UNDEF;
5884+
 ASN1StringPointer parameters;
5885+
if (pss_params_) {
5886+
 parameters = EncodeRsaPssParams(*pss_params_);
5887+
if (!parameters) return {};
5888+
 parameter_type = V_ASN1_SEQUENCE;
5889+
 }
5890+
5891+
if (X509_PUBKEY_set0_param(pubkey.get(),
5892+
OBJ_nid2obj(NID_rsaEncryption),
5893+
 parameter_type,
5894+
 parameters.get(),
5895+
nullptr,
5896+
0) != 1) {
5897+
return {};
5898+
 }
5899+
 parameters.release();
5900+
if (i2d_X509_PUBKEY_bio(bio.get(), pubkey.get()) != 1) return {};
58085901
#else
58095902
if (rsa_ == nullptr || i2d_RSA_PUBKEY_bio(bio.get(), rsa_) != 1) return {};
58105903
#endif
‎deps/ncrypto/ncrypto.h‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,7 @@ class Rsa final {
639639
private:
640640
#if NCRYPTO_USE_OPENSSL3_PROVIDER
641641
bool rsa_ = false;
642+
bool rsa_pss_ = false;
642643
 DeleteFnPtr<BIGNUM, BN_free> n_;
643644
 DeleteFnPtr<BIGNUM, BN_free> e_;
644645
 DeleteFnPtr<BIGNUM, BN_clear_free> d_;
‎test/fixtures/keys/Makefile‎
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ all: \
7171
 rsa_private_4096.pem \
7272
 rsa_public_2048.pem \
7373
 rsa_public_4096.pem \
74+
 rsa_pss_cert_2048.pem \
75+
 rsa_pss_cert_2048_sha256_sha256_16.pem \
7476
 rsa_pss_private_2048.pem \
7577
 rsa_pss_private_2048_sha256_sha256_16.pem \
7678
 rsa_pss_private_2048_sha512_sha256_20.pem \
@@ -918,6 +920,12 @@ rsa_pss_private_2048_sha512_sha256_20.pem:
918920
rsa_pss_private_2048_sha1_sha1_20.pem:
919921
	openssl genpkey -algorithm RSA-PSS -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 -pkeyopt rsa_pss_keygen_md:sha1 -pkeyopt rsa_pss_keygen_mgf1_md:sha1 -pkeyopt rsa_pss_keygen_saltlen:20 -out rsa_pss_private_2048_sha1_sha1_20.pem
920922

923+
rsa_pss_cert_2048.pem: rsa_pss_private_2048.pem
924+
	openssl req -new -x509 -key rsa_pss_private_2048.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048.pem
925+
926+
rsa_pss_cert_2048_sha256_sha256_16.pem: rsa_pss_private_2048_sha256_sha256_16.pem
927+
	openssl req -new -x509 -key rsa_pss_private_2048_sha256_sha256_16.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048_sha256_sha256_16.pem
928+
921929
rsa_pss_public_2048.pem: rsa_pss_private_2048.pem
922930
	openssl pkey -in rsa_pss_private_2048.pem -pubout -out rsa_pss_public_2048.pem
923931

‎test/fixtures/keys/rsa_pss_cert_2048.pem‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDWjCCAg6gAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCASAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjE4MzJaGA8yMTI2MDYyMjIyMTgzMlowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCASAwCwYJKoZIhvcNAQEKA4IBDwAwggEKAoIBAQDLg4x1
6+
Lzg+WAjkJEtt1u531G7u+msWvZg01SZ1PsPdiACmK/wKPMpcuJUOdswRP6XCa1qD
7+
8RxmzFUIqi+y7fSlgBIGuIc6IxVi6L35lomhD3IjqU6MbVFu5QElc1KMcEnGoGqZ
8+
yBk5vWZ1Gv95fOkAxYneF+4uiNTb7NRInf+u96l6lwsUbar2cDT48myQns+eHcvT
9+
J2e/dTeF24yfk5V+b8nHUU/JmkPXzi0l9/434xjezeEhx+46cv0+XhE8Z5pMLhPW
10+
jjrQ1obpsbtzZaGDo05pWBoUhqI1utNM0KlWN5PJqWxNdiVBDeGIqOy3RDul8USQ
11+
kOjyqKotp3UyyXn3AgMBAAGjUzBRMB0GA1UdDgQWBBQDCGflRn9LTmklPpSFii4J
12+
fQiQjTAfBgNVHSMEGDAWgBQDCGflRn9LTmklPpSFii4JfQiQjTAPBgNVHRMBAf8E
13+
BTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG
14+
9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIAOCAQEAsXJk8iu+XNSmIheNPvzfSoNp
15+
7kkFqFjWRwo/a4vXb4Y7DRDsMeUM4dGNtN75Gj5bppnYtQ3ku/DWGLrVRPGs/sRx
16+
itOJxvJzPNCv4yYUwm8p8ua7l1Sdmrder84XTG/Dm3dOoUOxCmEQzzjghXE0mRih
17+
UC4aPyOGNHNlQg5YyEmfEnltlL12ls8cHE+5R56xeI34T/MukH0NVf7wNNfqrMqy
18+
PrrXG79+D3+Jeu3ddtwvoKQyQ/VuszJGjdplkDodttyTfu3GOgC/bbR9iz2GkcTV
19+
NEkjJHenMzpoAoNZukeuClOHF6NT3hBnKPmcZYlLPgIY1iOBYoGwctgb5pPxNg==
20+
-----END CERTIFICATE-----
‎test/fixtures/keys/rsa_pss_cert_2048_sha256_sha256_16.pem‎
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDkDCCAkSgAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCARAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjAyMzVaGA8yMTI2MDYyMjIyMDIzNVowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCAVYwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgEF
6+
AKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQMEAgEFAKIDAgEQA4IBDwAwggEKAoIB
7+
AQDfqNM4C+QtD73iILqOkqfV8ha3O19jpX8UujIk1Z72bbbuwEzh0+sBw0dD0N8C
8+
gkXnePOEEd6q7HNmbyCNqRpDK6NDvaCMDWgEaD/PlHkRntvKh81IXSMC5imjRfOc
9+
ZIE/Gnw7h8tanab0n75+ODvLJrmEWUG2q79Im1mWMx7Spod+Np6XEY+7I7nAUUWi
10+
vr35Yx5DeyxY8rxFGpsLtGsi7JNQO4aHyeBpj8tz0Fhv23uPywE2nGmPHfnkXWbr
11+
TcHGbzYBgEbeSH9KUkRwczqDXNOPhtfaEHEFTm0MoeKCnJe1VOjSywev77dV1KZf
12+
pVh3Kh0ZRQIe9YOVJhj4lMx3AgMBAAGjUzBRMB0GA1UdDgQWBBRrGC6N4gEM/Il9
13+
PMkKs+dhCbldkjAfBgNVHSMEGDAWgBRrGC6N4gEM/Il9PMkKs+dhCbldkjAPBgNV
14+
HRMBAf8EBTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAa
15+
BgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBEAOCAQEA1SP4HNSgQm2OpuRb
16+
VjEDyVANpCyuKjUFY0FAwart4YSKHwERuR5VccugGwlbnH0vKQ2uwTB/a5BlXssg
17+
0KB8qjDoOoxzhgZTA7yuHuQLpgCQhd00ORpxFYI1CyB+HywrpbuV4LHJoZjO7B6O
18+
Z0PPRs77023WkT/O4KRrFH8uaMgPMwUIjIGXzSp+TYObLnYTWmGyJ7rJVwOPH30z
19+
+BY++W0ZhkCuJveajuF3vGpA4o/lA0kcf6Hz2Prl28kHu0hOpZNTx2zMl+GFtlWE
20+
TIybjAvbA4TJW0rAURRuP4lhYsPJAnZDAnxHFvLeLKypfctv7eAc82U8rVjT+DIA
21+
NjayPQ==
22+
-----END CERTIFICATE-----
‎test/parallel/test-crypto-x509.js‎
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ if (!common.hasCrypto)
77

88
const{
99
 X509Certificate,
10+
 createHash,
1011
 createPrivateKey,
1112
 generateKeyPairSync,
1213
 createSign,
@@ -27,6 +28,42 @@ const ca = readFileSync(fixtures.path('keys', 'ca1-cert.pem'));
2728

2829
constprivateKey=createPrivateKey(key);
2930

31+
if(!process.features.openssl_is_boringssl){
32+
constexpectedPubkeys=hasOpenSSL3 ? [
33+
[
34+
'rsa_pss_cert_2048.pem',
35+
292,
36+
'dff998a209bfa2e6ded1208c6e57f5b6bdedfa44b631265e3e244f38e637f6e4',
37+
],
38+
[
39+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
40+
342,
41+
'da0bcd53fbe3969c7cc2730f86abc34e0e1c340264bbdfa3faf01484c2eeece0',
42+
],
43+
] : [
44+
[
45+
'rsa_pss_cert_2048.pem',
46+
294,
47+
'4d4f2f076aced4f0df922b84b466b0a60ba4cb50a23d695ae12ddc5fff7aca14',
48+
],
49+
[
50+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
51+
294,
52+
'd37942c3bd02bc25c724fcd31efd647824e536c13d62d9ad0b5db8c0900d3cba',
53+
],
54+
];
55+
56+
for(const[name,length,digest]ofexpectedPubkeys){
57+
constpssCert=newX509Certificate(
58+
readFileSync(fixtures.path('keys',name)));
59+
constpubkey=pssCert.toLegacyObject().pubkey;
60+
assert.strictEqual(pubkey.length,length);
61+
assert.strictEqual(
62+
createHash('sha256').update(pubkey).digest('hex'),
63+
digest);
64+
}
65+
}
66+
3067
[1,{},false,null].forEach((i)=>{
3168
assert.throws(()=>newX509Certificate(i),{
3269
code: 'ERR_INVALID_ARG_TYPE'
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit b65a8f3
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: preserve RSA-PSS legacy pubkey DER
Recreate the historical rsaEncryption AlgorithmIdentifier used by
X509Certificate legacy pubkey output for restricted and unrestricted
RSA-PSS keys without relying on deprecated RSA APIs.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #64547
Backport-PR-URL: #65087
Refs: #64211
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 49f2ae2 commit b65a8f3
6 files changed
Lines changed: 182 additions & 1 deletion
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 94 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9393
}
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
96+
using ASN1StringPointer = DeleteFnPtr<ASN1_STRING, ASN1_STRING_free>;
9697
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
98+
using RsaPssParamsPointer = DeleteFnPtr<RSA_PSS_PARAMS, RSA_PSS_PARAMS_free>;
99+
using X509AlgorPointer = DeleteFnPtr<X509_ALGOR, X509_ALGOR_free>;
100+
using X509PubkeyPointer = DeleteFnPtr<X509_PUBKEY, X509_PUBKEY_free>;
97101
structOSSLParamDeleter {
98102
voidoperator()(OSSL_PARAM* params) const {
99103
if (params == nullptr) return;
@@ -5702,13 +5706,74 @@ bool ReadRsaPssParams(const EVP_PKEY* pkey, Rsa::PssParams* params) {
57025706

57035707
returntrue;
57045708
}
5709+
5710+
boolSetRsaPssHashAlgorithm(X509_ALGOR** out, const Digest& digest) {
5711+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5712+
5713+
 X509AlgorPointer algorithm(X509_ALGOR_new());
5714+
if (!algorithm) returnfalse;
5715+
X509_ALGOR_set_md(algorithm.get(), digest.get());
5716+
 *out = algorithm.release();
5717+
returntrue;
5718+
}
5719+
5720+
boolSetRsaPssMaskGenAlgorithm(X509_ALGOR** out, const Digest& digest) {
5721+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5722+
5723+
 X509AlgorPointer hash_algorithm(X509_ALGOR_new());
5724+
if (!hash_algorithm) returnfalse;
5725+
X509_ALGOR_set_md(hash_algorithm.get(), digest.get());
5726+
5727+
 ASN1StringPointer hash_algorithm_der(ASN1_item_pack(
5728+
 hash_algorithm.get(), ASN1_ITEM_rptr(X509_ALGOR), nullptr));
5729+
if (!hash_algorithm_der) returnfalse;
5730+
5731+
 X509AlgorPointer algorithm(X509_ALGOR_new());
5732+
if (!algorithm || X509_ALGOR_set0(algorithm.get(),
5733+
OBJ_nid2obj(NID_mgf1),
5734+
V_ASN1_SEQUENCE,
5735+
 hash_algorithm_der.get()) != 1) {
5736+
returnfalse;
5737+
 }
5738+
 hash_algorithm_der.release();
5739+
 *out = algorithm.release();
5740+
returntrue;
5741+
}
5742+
5743+
ASN1StringPointer EncodeRsaPssParams(const Rsa::PssParams& params) {
5744+
const Digest digest = Digest::FromName(params.digest.data());
5745+
if (!digest) return {};
5746+
5747+
const Digest mgf1_digest = params.mgf1_digest
5748+
 ? Digest::FromName(params.mgf1_digest->data())
5749+
 : digest;
5750+
if (!mgf1_digest) return {};
5751+
5752+
 RsaPssParamsPointer pss(RSA_PSS_PARAMS_new());
5753+
if (!pss || !SetRsaPssHashAlgorithm(&pss->hashAlgorithm, digest) ||
5754+
 !SetRsaPssMaskGenAlgorithm(&pss->maskGenAlgorithm, mgf1_digest)) {
5755+
return {};
5756+
 }
5757+
5758+
if (params.salt_length != 20) {
5759+
 pss->saltLength = ASN1_INTEGER_new();
5760+
if (pss->saltLength == nullptr ||
5761+
ASN1_INTEGER_set_int64(pss->saltLength, params.salt_length) != 1) {
5762+
return {};
5763+
 }
5764+
 }
5765+
5766+
returnASN1StringPointer(
5767+
ASN1_item_pack(pss.get(), ASN1_ITEM_rptr(RSA_PSS_PARAMS), nullptr));
5768+
}
57055769
} // namespace
57065770

57075771
Rsa::Rsa() : rsa_(false) {}
57085772

57095773
Rsa::Rsa(constEVP_PKEY* pkey) : Rsa() {
57105774
constint type = EVPKeyPointer::id(pkey);
57115775
if (type != EVP_PKEY_RSA && type != EVP_PKEY_RSA_PSS) return;
5776+
 rsa_pss_ = type == EVP_PKEY_RSA_PSS;
57125777
if (!GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_N, &n_) ||
57135778
 !GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_E, &e_)) {
57145779
return;
@@ -5804,7 +5869,35 @@ BIOPointer Rsa::derPublicKey() const {
58045869
if (!bio) return {};
58055870
#if NCRYPTO_USE_OPENSSL3_PROVIDER
58065871
auto pkey = EVPKeyPointer::NewRSA(*this);
5807-
if (!pkey || i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5872+
if (!pkey) return {};
5873+
if (!rsa_pss_) {
5874+
if (i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5875+
return bio;
5876+
 }
5877+
5878+
X509_PUBKEY* raw_pubkey = nullptr;
5879+
constint result = X509_PUBKEY_set(&raw_pubkey, pkey.get());
5880+
 X509PubkeyPointer pubkey(raw_pubkey);
5881+
if (result != 1) return {};
5882+
5883+
int parameter_type = V_ASN1_UNDEF;
5884+
 ASN1StringPointer parameters;
5885+
if (pss_params_) {
5886+
 parameters = EncodeRsaPssParams(*pss_params_);
5887+
if (!parameters) return {};
5888+
 parameter_type = V_ASN1_SEQUENCE;
5889+
 }
5890+
5891+
if (X509_PUBKEY_set0_param(pubkey.get(),
5892+
OBJ_nid2obj(NID_rsaEncryption),
5893+
 parameter_type,
5894+
 parameters.get(),
5895+
nullptr,
5896+
0) != 1) {
5897+
return {};
5898+
 }
5899+
 parameters.release();
5900+
if (i2d_X509_PUBKEY_bio(bio.get(), pubkey.get()) != 1) return {};
58085901
#else
58095902
if (rsa_ == nullptr || i2d_RSA_PUBKEY_bio(bio.get(), rsa_) != 1) return {};
58105903
#endif
‎deps/ncrypto/ncrypto.h‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,7 @@ class Rsa final {
639639
private:
640640
#if NCRYPTO_USE_OPENSSL3_PROVIDER
641641
bool rsa_ = false;
642+
bool rsa_pss_ = false;
642643
 DeleteFnPtr<BIGNUM, BN_free> n_;
643644
 DeleteFnPtr<BIGNUM, BN_free> e_;
644645
 DeleteFnPtr<BIGNUM, BN_clear_free> d_;
‎test/fixtures/keys/Makefile‎
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ all: \
7171
 rsa_private_4096.pem \
7272
 rsa_public_2048.pem \
7373
 rsa_public_4096.pem \
74+
 rsa_pss_cert_2048.pem \
75+
 rsa_pss_cert_2048_sha256_sha256_16.pem \
7476
 rsa_pss_private_2048.pem \
7577
 rsa_pss_private_2048_sha256_sha256_16.pem \
7678
 rsa_pss_private_2048_sha512_sha256_20.pem \
@@ -918,6 +920,12 @@ rsa_pss_private_2048_sha512_sha256_20.pem:
918920
rsa_pss_private_2048_sha1_sha1_20.pem:
919921
	openssl genpkey -algorithm RSA-PSS -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 -pkeyopt rsa_pss_keygen_md:sha1 -pkeyopt rsa_pss_keygen_mgf1_md:sha1 -pkeyopt rsa_pss_keygen_saltlen:20 -out rsa_pss_private_2048_sha1_sha1_20.pem
920922

923+
rsa_pss_cert_2048.pem: rsa_pss_private_2048.pem
924+
	openssl req -new -x509 -key rsa_pss_private_2048.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048.pem
925+
926+
rsa_pss_cert_2048_sha256_sha256_16.pem: rsa_pss_private_2048_sha256_sha256_16.pem
927+
	openssl req -new -x509 -key rsa_pss_private_2048_sha256_sha256_16.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048_sha256_sha256_16.pem
928+
921929
rsa_pss_public_2048.pem: rsa_pss_private_2048.pem
922930
	openssl pkey -in rsa_pss_private_2048.pem -pubout -out rsa_pss_public_2048.pem
923931

‎test/fixtures/keys/rsa_pss_cert_2048.pem‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDWjCCAg6gAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCASAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjE4MzJaGA8yMTI2MDYyMjIyMTgzMlowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCASAwCwYJKoZIhvcNAQEKA4IBDwAwggEKAoIBAQDLg4x1
6+
Lzg+WAjkJEtt1u531G7u+msWvZg01SZ1PsPdiACmK/wKPMpcuJUOdswRP6XCa1qD
7+
8RxmzFUIqi+y7fSlgBIGuIc6IxVi6L35lomhD3IjqU6MbVFu5QElc1KMcEnGoGqZ
8+
yBk5vWZ1Gv95fOkAxYneF+4uiNTb7NRInf+u96l6lwsUbar2cDT48myQns+eHcvT
9+
J2e/dTeF24yfk5V+b8nHUU/JmkPXzi0l9/434xjezeEhx+46cv0+XhE8Z5pMLhPW
10+
jjrQ1obpsbtzZaGDo05pWBoUhqI1utNM0KlWN5PJqWxNdiVBDeGIqOy3RDul8USQ
11+
kOjyqKotp3UyyXn3AgMBAAGjUzBRMB0GA1UdDgQWBBQDCGflRn9LTmklPpSFii4J
12+
fQiQjTAfBgNVHSMEGDAWgBQDCGflRn9LTmklPpSFii4JfQiQjTAPBgNVHRMBAf8E
13+
BTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG
14+
9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIAOCAQEAsXJk8iu+XNSmIheNPvzfSoNp
15+
7kkFqFjWRwo/a4vXb4Y7DRDsMeUM4dGNtN75Gj5bppnYtQ3ku/DWGLrVRPGs/sRx
16+
itOJxvJzPNCv4yYUwm8p8ua7l1Sdmrder84XTG/Dm3dOoUOxCmEQzzjghXE0mRih
17+
UC4aPyOGNHNlQg5YyEmfEnltlL12ls8cHE+5R56xeI34T/MukH0NVf7wNNfqrMqy
18+
PrrXG79+D3+Jeu3ddtwvoKQyQ/VuszJGjdplkDodttyTfu3GOgC/bbR9iz2GkcTV
19+
NEkjJHenMzpoAoNZukeuClOHF6NT3hBnKPmcZYlLPgIY1iOBYoGwctgb5pPxNg==
20+
-----END CERTIFICATE-----
‎test/fixtures/keys/rsa_pss_cert_2048_sha256_sha256_16.pem‎
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDkDCCAkSgAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCARAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjAyMzVaGA8yMTI2MDYyMjIyMDIzNVowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCAVYwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgEF
6+
AKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQMEAgEFAKIDAgEQA4IBDwAwggEKAoIB
7+
AQDfqNM4C+QtD73iILqOkqfV8ha3O19jpX8UujIk1Z72bbbuwEzh0+sBw0dD0N8C
8+
gkXnePOEEd6q7HNmbyCNqRpDK6NDvaCMDWgEaD/PlHkRntvKh81IXSMC5imjRfOc
9+
ZIE/Gnw7h8tanab0n75+ODvLJrmEWUG2q79Im1mWMx7Spod+Np6XEY+7I7nAUUWi
10+
vr35Yx5DeyxY8rxFGpsLtGsi7JNQO4aHyeBpj8tz0Fhv23uPywE2nGmPHfnkXWbr
11+
TcHGbzYBgEbeSH9KUkRwczqDXNOPhtfaEHEFTm0MoeKCnJe1VOjSywev77dV1KZf
12+
pVh3Kh0ZRQIe9YOVJhj4lMx3AgMBAAGjUzBRMB0GA1UdDgQWBBRrGC6N4gEM/Il9
13+
PMkKs+dhCbldkjAfBgNVHSMEGDAWgBRrGC6N4gEM/Il9PMkKs+dhCbldkjAPBgNV
14+
HRMBAf8EBTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAa
15+
BgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBEAOCAQEA1SP4HNSgQm2OpuRb
16+
VjEDyVANpCyuKjUFY0FAwart4YSKHwERuR5VccugGwlbnH0vKQ2uwTB/a5BlXssg
17+
0KB8qjDoOoxzhgZTA7yuHuQLpgCQhd00ORpxFYI1CyB+HywrpbuV4LHJoZjO7B6O
18+
Z0PPRs77023WkT/O4KRrFH8uaMgPMwUIjIGXzSp+TYObLnYTWmGyJ7rJVwOPH30z
19+
+BY++W0ZhkCuJveajuF3vGpA4o/lA0kcf6Hz2Prl28kHu0hOpZNTx2zMl+GFtlWE
20+
TIybjAvbA4TJW0rAURRuP4lhYsPJAnZDAnxHFvLeLKypfctv7eAc82U8rVjT+DIA
21+
NjayPQ==
22+
-----END CERTIFICATE-----
‎test/parallel/test-crypto-x509.js‎
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ if (!common.hasCrypto)
77

88
const{
99
 X509Certificate,
10+
 createHash,
1011
 createPrivateKey,
1112
 generateKeyPairSync,
1213
 createSign,
@@ -27,6 +28,42 @@ const ca = readFileSync(fixtures.path('keys', 'ca1-cert.pem'));
2728

2829
constprivateKey=createPrivateKey(key);
2930

31+
if(!process.features.openssl_is_boringssl){
32+
constexpectedPubkeys=hasOpenSSL3 ? [
33+
[
34+
'rsa_pss_cert_2048.pem',
35+
292,
36+
'dff998a209bfa2e6ded1208c6e57f5b6bdedfa44b631265e3e244f38e637f6e4',
37+
],
38+
[
39+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
40+
342,
41+
'da0bcd53fbe3969c7cc2730f86abc34e0e1c340264bbdfa3faf01484c2eeece0',
42+
],
43+
] : [
44+
[
45+
'rsa_pss_cert_2048.pem',
46+
294,
47+
'4d4f2f076aced4f0df922b84b466b0a60ba4cb50a23d695ae12ddc5fff7aca14',
48+
],
49+
[
50+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
51+
294,
52+
'd37942c3bd02bc25c724fcd31efd647824e536c13d62d9ad0b5db8c0900d3cba',
53+
],
54+
];
55+
56+
for(const[name,length,digest]ofexpectedPubkeys){
57+
constpssCert=newX509Certificate(
58+
readFileSync(fixtures.path('keys',name)));
59+
constpubkey=pssCert.toLegacyObject().pubkey;
60+
assert.strictEqual(pubkey.length,length);
61+
assert.strictEqual(
62+
createHash('sha256').update(pubkey).digest('hex'),
63+
digest);
64+
}
65+
}
66+
3067
[1,{},false,null].forEach((i)=>{
3168
assert.throws(()=>newX509Certificate(i),{
3269
code: 'ERR_INVALID_ARG_TYPE'
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit b65a8f3
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: preserve RSA-PSS legacy pubkey DER
Recreate the historical rsaEncryption AlgorithmIdentifier used by
X509Certificate legacy pubkey output for restricted and unrestricted
RSA-PSS keys without relying on deprecated RSA APIs.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #64547
Backport-PR-URL: #65087
Refs: #64211
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 49f2ae2 commit b65a8f3
6 files changed
Lines changed: 182 additions & 1 deletion
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 94 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9393
}
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
96+
using ASN1StringPointer = DeleteFnPtr<ASN1_STRING, ASN1_STRING_free>;
9697
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
98+
using RsaPssParamsPointer = DeleteFnPtr<RSA_PSS_PARAMS, RSA_PSS_PARAMS_free>;
99+
using X509AlgorPointer = DeleteFnPtr<X509_ALGOR, X509_ALGOR_free>;
100+
using X509PubkeyPointer = DeleteFnPtr<X509_PUBKEY, X509_PUBKEY_free>;
97101
structOSSLParamDeleter {
98102
voidoperator()(OSSL_PARAM* params) const {
99103
if (params == nullptr) return;
@@ -5702,13 +5706,74 @@ bool ReadRsaPssParams(const EVP_PKEY* pkey, Rsa::PssParams* params) {
57025706

57035707
returntrue;
57045708
}
5709+
5710+
boolSetRsaPssHashAlgorithm(X509_ALGOR** out, const Digest& digest) {
5711+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5712+
5713+
 X509AlgorPointer algorithm(X509_ALGOR_new());
5714+
if (!algorithm) returnfalse;
5715+
X509_ALGOR_set_md(algorithm.get(), digest.get());
5716+
 *out = algorithm.release();
5717+
returntrue;
5718+
}
5719+
5720+
boolSetRsaPssMaskGenAlgorithm(X509_ALGOR** out, const Digest& digest) {
5721+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5722+
5723+
 X509AlgorPointer hash_algorithm(X509_ALGOR_new());
5724+
if (!hash_algorithm) returnfalse;
5725+
X509_ALGOR_set_md(hash_algorithm.get(), digest.get());
5726+
5727+
 ASN1StringPointer hash_algorithm_der(ASN1_item_pack(
5728+
 hash_algorithm.get(), ASN1_ITEM_rptr(X509_ALGOR), nullptr));
5729+
if (!hash_algorithm_der) returnfalse;
5730+
5731+
 X509AlgorPointer algorithm(X509_ALGOR_new());
5732+
if (!algorithm || X509_ALGOR_set0(algorithm.get(),
5733+
OBJ_nid2obj(NID_mgf1),
5734+
V_ASN1_SEQUENCE,
5735+
 hash_algorithm_der.get()) != 1) {
5736+
returnfalse;
5737+
 }
5738+
 hash_algorithm_der.release();
5739+
 *out = algorithm.release();
5740+
returntrue;
5741+
}
5742+
5743+
ASN1StringPointer EncodeRsaPssParams(const Rsa::PssParams& params) {
5744+
const Digest digest = Digest::FromName(params.digest.data());
5745+
if (!digest) return {};
5746+
5747+
const Digest mgf1_digest = params.mgf1_digest
5748+
 ? Digest::FromName(params.mgf1_digest->data())
5749+
 : digest;
5750+
if (!mgf1_digest) return {};
5751+
5752+
 RsaPssParamsPointer pss(RSA_PSS_PARAMS_new());
5753+
if (!pss || !SetRsaPssHashAlgorithm(&pss->hashAlgorithm, digest) ||
5754+
 !SetRsaPssMaskGenAlgorithm(&pss->maskGenAlgorithm, mgf1_digest)) {
5755+
return {};
5756+
 }
5757+
5758+
if (params.salt_length != 20) {
5759+
 pss->saltLength = ASN1_INTEGER_new();
5760+
if (pss->saltLength == nullptr ||
5761+
ASN1_INTEGER_set_int64(pss->saltLength, params.salt_length) != 1) {
5762+
return {};
5763+
 }
5764+
 }
5765+
5766+
returnASN1StringPointer(
5767+
ASN1_item_pack(pss.get(), ASN1_ITEM_rptr(RSA_PSS_PARAMS), nullptr));
5768+
}
57055769
} // namespace
57065770

57075771
Rsa::Rsa() : rsa_(false) {}
57085772

57095773
Rsa::Rsa(constEVP_PKEY* pkey) : Rsa() {
57105774
constint type = EVPKeyPointer::id(pkey);
57115775
if (type != EVP_PKEY_RSA && type != EVP_PKEY_RSA_PSS) return;
5776+
 rsa_pss_ = type == EVP_PKEY_RSA_PSS;
57125777
if (!GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_N, &n_) ||
57135778
 !GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_E, &e_)) {
57145779
return;
@@ -5804,7 +5869,35 @@ BIOPointer Rsa::derPublicKey() const {
58045869
if (!bio) return {};
58055870
#if NCRYPTO_USE_OPENSSL3_PROVIDER
58065871
auto pkey = EVPKeyPointer::NewRSA(*this);
5807-
if (!pkey || i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5872+
if (!pkey) return {};
5873+
if (!rsa_pss_) {
5874+
if (i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5875+
return bio;
5876+
 }
5877+
5878+
X509_PUBKEY* raw_pubkey = nullptr;
5879+
constint result = X509_PUBKEY_set(&raw_pubkey, pkey.get());
5880+
 X509PubkeyPointer pubkey(raw_pubkey);
5881+
if (result != 1) return {};
5882+
5883+
int parameter_type = V_ASN1_UNDEF;
5884+
 ASN1StringPointer parameters;
5885+
if (pss_params_) {
5886+
 parameters = EncodeRsaPssParams(*pss_params_);
5887+
if (!parameters) return {};
5888+
 parameter_type = V_ASN1_SEQUENCE;
5889+
 }
5890+
5891+
if (X509_PUBKEY_set0_param(pubkey.get(),
5892+
OBJ_nid2obj(NID_rsaEncryption),
5893+
 parameter_type,
5894+
 parameters.get(),
5895+
nullptr,
5896+
0) != 1) {
5897+
return {};
5898+
 }
5899+
 parameters.release();
5900+
if (i2d_X509_PUBKEY_bio(bio.get(), pubkey.get()) != 1) return {};
58085901
#else
58095902
if (rsa_ == nullptr || i2d_RSA_PUBKEY_bio(bio.get(), rsa_) != 1) return {};
58105903
#endif
‎deps/ncrypto/ncrypto.h‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,7 @@ class Rsa final {
639639
private:
640640
#if NCRYPTO_USE_OPENSSL3_PROVIDER
641641
bool rsa_ = false;
642+
bool rsa_pss_ = false;
642643
 DeleteFnPtr<BIGNUM, BN_free> n_;
643644
 DeleteFnPtr<BIGNUM, BN_free> e_;
644645
 DeleteFnPtr<BIGNUM, BN_clear_free> d_;
‎test/fixtures/keys/Makefile‎
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ all: \
7171
 rsa_private_4096.pem \
7272
 rsa_public_2048.pem \
7373
 rsa_public_4096.pem \
74+
 rsa_pss_cert_2048.pem \
75+
 rsa_pss_cert_2048_sha256_sha256_16.pem \
7476
 rsa_pss_private_2048.pem \
7577
 rsa_pss_private_2048_sha256_sha256_16.pem \
7678
 rsa_pss_private_2048_sha512_sha256_20.pem \
@@ -918,6 +920,12 @@ rsa_pss_private_2048_sha512_sha256_20.pem:
918920
rsa_pss_private_2048_sha1_sha1_20.pem:
919921
	openssl genpkey -algorithm RSA-PSS -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 -pkeyopt rsa_pss_keygen_md:sha1 -pkeyopt rsa_pss_keygen_mgf1_md:sha1 -pkeyopt rsa_pss_keygen_saltlen:20 -out rsa_pss_private_2048_sha1_sha1_20.pem
920922

923+
rsa_pss_cert_2048.pem: rsa_pss_private_2048.pem
924+
	openssl req -new -x509 -key rsa_pss_private_2048.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048.pem
925+
926+
rsa_pss_cert_2048_sha256_sha256_16.pem: rsa_pss_private_2048_sha256_sha256_16.pem
927+
	openssl req -new -x509 -key rsa_pss_private_2048_sha256_sha256_16.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048_sha256_sha256_16.pem
928+
921929
rsa_pss_public_2048.pem: rsa_pss_private_2048.pem
922930
	openssl pkey -in rsa_pss_private_2048.pem -pubout -out rsa_pss_public_2048.pem
923931

‎test/fixtures/keys/rsa_pss_cert_2048.pem‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDWjCCAg6gAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCASAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjE4MzJaGA8yMTI2MDYyMjIyMTgzMlowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCASAwCwYJKoZIhvcNAQEKA4IBDwAwggEKAoIBAQDLg4x1
6+
Lzg+WAjkJEtt1u531G7u+msWvZg01SZ1PsPdiACmK/wKPMpcuJUOdswRP6XCa1qD
7+
8RxmzFUIqi+y7fSlgBIGuIc6IxVi6L35lomhD3IjqU6MbVFu5QElc1KMcEnGoGqZ
8+
yBk5vWZ1Gv95fOkAxYneF+4uiNTb7NRInf+u96l6lwsUbar2cDT48myQns+eHcvT
9+
J2e/dTeF24yfk5V+b8nHUU/JmkPXzi0l9/434xjezeEhx+46cv0+XhE8Z5pMLhPW
10+
jjrQ1obpsbtzZaGDo05pWBoUhqI1utNM0KlWN5PJqWxNdiVBDeGIqOy3RDul8USQ
11+
kOjyqKotp3UyyXn3AgMBAAGjUzBRMB0GA1UdDgQWBBQDCGflRn9LTmklPpSFii4J
12+
fQiQjTAfBgNVHSMEGDAWgBQDCGflRn9LTmklPpSFii4JfQiQjTAPBgNVHRMBAf8E
13+
BTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG
14+
9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIAOCAQEAsXJk8iu+XNSmIheNPvzfSoNp
15+
7kkFqFjWRwo/a4vXb4Y7DRDsMeUM4dGNtN75Gj5bppnYtQ3ku/DWGLrVRPGs/sRx
16+
itOJxvJzPNCv4yYUwm8p8ua7l1Sdmrder84XTG/Dm3dOoUOxCmEQzzjghXE0mRih
17+
UC4aPyOGNHNlQg5YyEmfEnltlL12ls8cHE+5R56xeI34T/MukH0NVf7wNNfqrMqy
18+
PrrXG79+D3+Jeu3ddtwvoKQyQ/VuszJGjdplkDodttyTfu3GOgC/bbR9iz2GkcTV
19+
NEkjJHenMzpoAoNZukeuClOHF6NT3hBnKPmcZYlLPgIY1iOBYoGwctgb5pPxNg==
20+
-----END CERTIFICATE-----
‎test/fixtures/keys/rsa_pss_cert_2048_sha256_sha256_16.pem‎
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDkDCCAkSgAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCARAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjAyMzVaGA8yMTI2MDYyMjIyMDIzNVowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCAVYwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgEF
6+
AKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQMEAgEFAKIDAgEQA4IBDwAwggEKAoIB
7+
AQDfqNM4C+QtD73iILqOkqfV8ha3O19jpX8UujIk1Z72bbbuwEzh0+sBw0dD0N8C
8+
gkXnePOEEd6q7HNmbyCNqRpDK6NDvaCMDWgEaD/PlHkRntvKh81IXSMC5imjRfOc
9+
ZIE/Gnw7h8tanab0n75+ODvLJrmEWUG2q79Im1mWMx7Spod+Np6XEY+7I7nAUUWi
10+
vr35Yx5DeyxY8rxFGpsLtGsi7JNQO4aHyeBpj8tz0Fhv23uPywE2nGmPHfnkXWbr
11+
TcHGbzYBgEbeSH9KUkRwczqDXNOPhtfaEHEFTm0MoeKCnJe1VOjSywev77dV1KZf
12+
pVh3Kh0ZRQIe9YOVJhj4lMx3AgMBAAGjUzBRMB0GA1UdDgQWBBRrGC6N4gEM/Il9
13+
PMkKs+dhCbldkjAfBgNVHSMEGDAWgBRrGC6N4gEM/Il9PMkKs+dhCbldkjAPBgNV
14+
HRMBAf8EBTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAa
15+
BgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBEAOCAQEA1SP4HNSgQm2OpuRb
16+
VjEDyVANpCyuKjUFY0FAwart4YSKHwERuR5VccugGwlbnH0vKQ2uwTB/a5BlXssg
17+
0KB8qjDoOoxzhgZTA7yuHuQLpgCQhd00ORpxFYI1CyB+HywrpbuV4LHJoZjO7B6O
18+
Z0PPRs77023WkT/O4KRrFH8uaMgPMwUIjIGXzSp+TYObLnYTWmGyJ7rJVwOPH30z
19+
+BY++W0ZhkCuJveajuF3vGpA4o/lA0kcf6Hz2Prl28kHu0hOpZNTx2zMl+GFtlWE
20+
TIybjAvbA4TJW0rAURRuP4lhYsPJAnZDAnxHFvLeLKypfctv7eAc82U8rVjT+DIA
21+
NjayPQ==
22+
-----END CERTIFICATE-----
‎test/parallel/test-crypto-x509.js‎
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ if (!common.hasCrypto)
77

88
const{
99
 X509Certificate,
10+
 createHash,
1011
 createPrivateKey,
1112
 generateKeyPairSync,
1213
 createSign,
@@ -27,6 +28,42 @@ const ca = readFileSync(fixtures.path('keys', 'ca1-cert.pem'));
2728

2829
constprivateKey=createPrivateKey(key);
2930

31+
if(!process.features.openssl_is_boringssl){
32+
constexpectedPubkeys=hasOpenSSL3 ? [
33+
[
34+
'rsa_pss_cert_2048.pem',
35+
292,
36+
'dff998a209bfa2e6ded1208c6e57f5b6bdedfa44b631265e3e244f38e637f6e4',
37+
],
38+
[
39+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
40+
342,
41+
'da0bcd53fbe3969c7cc2730f86abc34e0e1c340264bbdfa3faf01484c2eeece0',
42+
],
43+
] : [
44+
[
45+
'rsa_pss_cert_2048.pem',
46+
294,
47+
'4d4f2f076aced4f0df922b84b466b0a60ba4cb50a23d695ae12ddc5fff7aca14',
48+
],
49+
[
50+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
51+
294,
52+
'd37942c3bd02bc25c724fcd31efd647824e536c13d62d9ad0b5db8c0900d3cba',
53+
],
54+
];
55+
56+
for(const[name,length,digest]ofexpectedPubkeys){
57+
constpssCert=newX509Certificate(
58+
readFileSync(fixtures.path('keys',name)));
59+
constpubkey=pssCert.toLegacyObject().pubkey;
60+
assert.strictEqual(pubkey.length,length);
61+
assert.strictEqual(
62+
createHash('sha256').update(pubkey).digest('hex'),
63+
digest);
64+
}
65+
}
66+
3067
[1,{},false,null].forEach((i)=>{
3168
assert.throws(()=>newX509Certificate(i),{
3269
code: 'ERR_INVALID_ARG_TYPE'
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit b65a8f3
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: preserve RSA-PSS legacy pubkey DER
Recreate the historical rsaEncryption AlgorithmIdentifier used by
X509Certificate legacy pubkey output for restricted and unrestricted
RSA-PSS keys without relying on deprecated RSA APIs.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #64547
Backport-PR-URL: #65087
Refs: #64211
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 49f2ae2 commit b65a8f3
6 files changed
Lines changed: 182 additions & 1 deletion
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 94 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9393
}
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
96+
using ASN1StringPointer = DeleteFnPtr<ASN1_STRING, ASN1_STRING_free>;
9697
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
98+
using RsaPssParamsPointer = DeleteFnPtr<RSA_PSS_PARAMS, RSA_PSS_PARAMS_free>;
99+
using X509AlgorPointer = DeleteFnPtr<X509_ALGOR, X509_ALGOR_free>;
100+
using X509PubkeyPointer = DeleteFnPtr<X509_PUBKEY, X509_PUBKEY_free>;
97101
structOSSLParamDeleter {
98102
voidoperator()(OSSL_PARAM* params) const {
99103
if (params == nullptr) return;
@@ -5702,13 +5706,74 @@ bool ReadRsaPssParams(const EVP_PKEY* pkey, Rsa::PssParams* params) {
57025706

57035707
returntrue;
57045708
}
5709+
5710+
boolSetRsaPssHashAlgorithm(X509_ALGOR** out, const Digest& digest) {
5711+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5712+
5713+
 X509AlgorPointer algorithm(X509_ALGOR_new());
5714+
if (!algorithm) returnfalse;
5715+
X509_ALGOR_set_md(algorithm.get(), digest.get());
5716+
 *out = algorithm.release();
5717+
returntrue;
5718+
}
5719+
5720+
boolSetRsaPssMaskGenAlgorithm(X509_ALGOR** out, const Digest& digest) {
5721+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5722+
5723+
 X509AlgorPointer hash_algorithm(X509_ALGOR_new());
5724+
if (!hash_algorithm) returnfalse;
5725+
X509_ALGOR_set_md(hash_algorithm.get(), digest.get());
5726+
5727+
 ASN1StringPointer hash_algorithm_der(ASN1_item_pack(
5728+
 hash_algorithm.get(), ASN1_ITEM_rptr(X509_ALGOR), nullptr));
5729+
if (!hash_algorithm_der) returnfalse;
5730+
5731+
 X509AlgorPointer algorithm(X509_ALGOR_new());
5732+
if (!algorithm || X509_ALGOR_set0(algorithm.get(),
5733+
OBJ_nid2obj(NID_mgf1),
5734+
V_ASN1_SEQUENCE,
5735+
 hash_algorithm_der.get()) != 1) {
5736+
returnfalse;
5737+
 }
5738+
 hash_algorithm_der.release();
5739+
 *out = algorithm.release();
5740+
returntrue;
5741+
}
5742+
5743+
ASN1StringPointer EncodeRsaPssParams(const Rsa::PssParams& params) {
5744+
const Digest digest = Digest::FromName(params.digest.data());
5745+
if (!digest) return {};
5746+
5747+
const Digest mgf1_digest = params.mgf1_digest
5748+
 ? Digest::FromName(params.mgf1_digest->data())
5749+
 : digest;
5750+
if (!mgf1_digest) return {};
5751+
5752+
 RsaPssParamsPointer pss(RSA_PSS_PARAMS_new());
5753+
if (!pss || !SetRsaPssHashAlgorithm(&pss->hashAlgorithm, digest) ||
5754+
 !SetRsaPssMaskGenAlgorithm(&pss->maskGenAlgorithm, mgf1_digest)) {
5755+
return {};
5756+
 }
5757+
5758+
if (params.salt_length != 20) {
5759+
 pss->saltLength = ASN1_INTEGER_new();
5760+
if (pss->saltLength == nullptr ||
5761+
ASN1_INTEGER_set_int64(pss->saltLength, params.salt_length) != 1) {
5762+
return {};
5763+
 }
5764+
 }
5765+
5766+
returnASN1StringPointer(
5767+
ASN1_item_pack(pss.get(), ASN1_ITEM_rptr(RSA_PSS_PARAMS), nullptr));
5768+
}
57055769
} // namespace
57065770

57075771
Rsa::Rsa() : rsa_(false) {}
57085772

57095773
Rsa::Rsa(constEVP_PKEY* pkey) : Rsa() {
57105774
constint type = EVPKeyPointer::id(pkey);
57115775
if (type != EVP_PKEY_RSA && type != EVP_PKEY_RSA_PSS) return;
5776+
 rsa_pss_ = type == EVP_PKEY_RSA_PSS;
57125777
if (!GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_N, &n_) ||
57135778
 !GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_E, &e_)) {
57145779
return;
@@ -5804,7 +5869,35 @@ BIOPointer Rsa::derPublicKey() const {
58045869
if (!bio) return {};
58055870
#if NCRYPTO_USE_OPENSSL3_PROVIDER
58065871
auto pkey = EVPKeyPointer::NewRSA(*this);
5807-
if (!pkey || i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5872+
if (!pkey) return {};
5873+
if (!rsa_pss_) {
5874+
if (i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5875+
return bio;
5876+
 }
5877+
5878+
X509_PUBKEY* raw_pubkey = nullptr;
5879+
constint result = X509_PUBKEY_set(&raw_pubkey, pkey.get());
5880+
 X509PubkeyPointer pubkey(raw_pubkey);
5881+
if (result != 1) return {};
5882+
5883+
int parameter_type = V_ASN1_UNDEF;
5884+
 ASN1StringPointer parameters;
5885+
if (pss_params_) {
5886+
 parameters = EncodeRsaPssParams(*pss_params_);
5887+
if (!parameters) return {};
5888+
 parameter_type = V_ASN1_SEQUENCE;
5889+
 }
5890+
5891+
if (X509_PUBKEY_set0_param(pubkey.get(),
5892+
OBJ_nid2obj(NID_rsaEncryption),
5893+
 parameter_type,
5894+
 parameters.get(),
5895+
nullptr,
5896+
0) != 1) {
5897+
return {};
5898+
 }
5899+
 parameters.release();
5900+
if (i2d_X509_PUBKEY_bio(bio.get(), pubkey.get()) != 1) return {};
58085901
#else
58095902
if (rsa_ == nullptr || i2d_RSA_PUBKEY_bio(bio.get(), rsa_) != 1) return {};
58105903
#endif
‎deps/ncrypto/ncrypto.h‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,7 @@ class Rsa final {
639639
private:
640640
#if NCRYPTO_USE_OPENSSL3_PROVIDER
641641
bool rsa_ = false;
642+
bool rsa_pss_ = false;
642643
 DeleteFnPtr<BIGNUM, BN_free> n_;
643644
 DeleteFnPtr<BIGNUM, BN_free> e_;
644645
 DeleteFnPtr<BIGNUM, BN_clear_free> d_;
‎test/fixtures/keys/Makefile‎
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ all: \
7171
 rsa_private_4096.pem \
7272
 rsa_public_2048.pem \
7373
 rsa_public_4096.pem \
74+
 rsa_pss_cert_2048.pem \
75+
 rsa_pss_cert_2048_sha256_sha256_16.pem \
7476
 rsa_pss_private_2048.pem \
7577
 rsa_pss_private_2048_sha256_sha256_16.pem \
7678
 rsa_pss_private_2048_sha512_sha256_20.pem \
@@ -918,6 +920,12 @@ rsa_pss_private_2048_sha512_sha256_20.pem:
918920
rsa_pss_private_2048_sha1_sha1_20.pem:
919921
	openssl genpkey -algorithm RSA-PSS -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 -pkeyopt rsa_pss_keygen_md:sha1 -pkeyopt rsa_pss_keygen_mgf1_md:sha1 -pkeyopt rsa_pss_keygen_saltlen:20 -out rsa_pss_private_2048_sha1_sha1_20.pem
920922

923+
rsa_pss_cert_2048.pem: rsa_pss_private_2048.pem
924+
	openssl req -new -x509 -key rsa_pss_private_2048.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048.pem
925+
926+
rsa_pss_cert_2048_sha256_sha256_16.pem: rsa_pss_private_2048_sha256_sha256_16.pem
927+
	openssl req -new -x509 -key rsa_pss_private_2048_sha256_sha256_16.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048_sha256_sha256_16.pem
928+
921929
rsa_pss_public_2048.pem: rsa_pss_private_2048.pem
922930
	openssl pkey -in rsa_pss_private_2048.pem -pubout -out rsa_pss_public_2048.pem
923931

‎test/fixtures/keys/rsa_pss_cert_2048.pem‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDWjCCAg6gAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCASAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjE4MzJaGA8yMTI2MDYyMjIyMTgzMlowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCASAwCwYJKoZIhvcNAQEKA4IBDwAwggEKAoIBAQDLg4x1
6+
Lzg+WAjkJEtt1u531G7u+msWvZg01SZ1PsPdiACmK/wKPMpcuJUOdswRP6XCa1qD
7+
8RxmzFUIqi+y7fSlgBIGuIc6IxVi6L35lomhD3IjqU6MbVFu5QElc1KMcEnGoGqZ
8+
yBk5vWZ1Gv95fOkAxYneF+4uiNTb7NRInf+u96l6lwsUbar2cDT48myQns+eHcvT
9+
J2e/dTeF24yfk5V+b8nHUU/JmkPXzi0l9/434xjezeEhx+46cv0+XhE8Z5pMLhPW
10+
jjrQ1obpsbtzZaGDo05pWBoUhqI1utNM0KlWN5PJqWxNdiVBDeGIqOy3RDul8USQ
11+
kOjyqKotp3UyyXn3AgMBAAGjUzBRMB0GA1UdDgQWBBQDCGflRn9LTmklPpSFii4J
12+
fQiQjTAfBgNVHSMEGDAWgBQDCGflRn9LTmklPpSFii4JfQiQjTAPBgNVHRMBAf8E
13+
BTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG
14+
9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIAOCAQEAsXJk8iu+XNSmIheNPvzfSoNp
15+
7kkFqFjWRwo/a4vXb4Y7DRDsMeUM4dGNtN75Gj5bppnYtQ3ku/DWGLrVRPGs/sRx
16+
itOJxvJzPNCv4yYUwm8p8ua7l1Sdmrder84XTG/Dm3dOoUOxCmEQzzjghXE0mRih
17+
UC4aPyOGNHNlQg5YyEmfEnltlL12ls8cHE+5R56xeI34T/MukH0NVf7wNNfqrMqy
18+
PrrXG79+D3+Jeu3ddtwvoKQyQ/VuszJGjdplkDodttyTfu3GOgC/bbR9iz2GkcTV
19+
NEkjJHenMzpoAoNZukeuClOHF6NT3hBnKPmcZYlLPgIY1iOBYoGwctgb5pPxNg==
20+
-----END CERTIFICATE-----
‎test/fixtures/keys/rsa_pss_cert_2048_sha256_sha256_16.pem‎
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDkDCCAkSgAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCARAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjAyMzVaGA8yMTI2MDYyMjIyMDIzNVowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCAVYwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgEF
6+
AKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQMEAgEFAKIDAgEQA4IBDwAwggEKAoIB
7+
AQDfqNM4C+QtD73iILqOkqfV8ha3O19jpX8UujIk1Z72bbbuwEzh0+sBw0dD0N8C
8+
gkXnePOEEd6q7HNmbyCNqRpDK6NDvaCMDWgEaD/PlHkRntvKh81IXSMC5imjRfOc
9+
ZIE/Gnw7h8tanab0n75+ODvLJrmEWUG2q79Im1mWMx7Spod+Np6XEY+7I7nAUUWi
10+
vr35Yx5DeyxY8rxFGpsLtGsi7JNQO4aHyeBpj8tz0Fhv23uPywE2nGmPHfnkXWbr
11+
TcHGbzYBgEbeSH9KUkRwczqDXNOPhtfaEHEFTm0MoeKCnJe1VOjSywev77dV1KZf
12+
pVh3Kh0ZRQIe9YOVJhj4lMx3AgMBAAGjUzBRMB0GA1UdDgQWBBRrGC6N4gEM/Il9
13+
PMkKs+dhCbldkjAfBgNVHSMEGDAWgBRrGC6N4gEM/Il9PMkKs+dhCbldkjAPBgNV
14+
HRMBAf8EBTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAa
15+
BgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBEAOCAQEA1SP4HNSgQm2OpuRb
16+
VjEDyVANpCyuKjUFY0FAwart4YSKHwERuR5VccugGwlbnH0vKQ2uwTB/a5BlXssg
17+
0KB8qjDoOoxzhgZTA7yuHuQLpgCQhd00ORpxFYI1CyB+HywrpbuV4LHJoZjO7B6O
18+
Z0PPRs77023WkT/O4KRrFH8uaMgPMwUIjIGXzSp+TYObLnYTWmGyJ7rJVwOPH30z
19+
+BY++W0ZhkCuJveajuF3vGpA4o/lA0kcf6Hz2Prl28kHu0hOpZNTx2zMl+GFtlWE
20+
TIybjAvbA4TJW0rAURRuP4lhYsPJAnZDAnxHFvLeLKypfctv7eAc82U8rVjT+DIA
21+
NjayPQ==
22+
-----END CERTIFICATE-----
‎test/parallel/test-crypto-x509.js‎
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ if (!common.hasCrypto)
77

88
const{
99
 X509Certificate,
10+
 createHash,
1011
 createPrivateKey,
1112
 generateKeyPairSync,
1213
 createSign,
@@ -27,6 +28,42 @@ const ca = readFileSync(fixtures.path('keys', 'ca1-cert.pem'));
2728

2829
constprivateKey=createPrivateKey(key);
2930

31+
if(!process.features.openssl_is_boringssl){
32+
constexpectedPubkeys=hasOpenSSL3 ? [
33+
[
34+
'rsa_pss_cert_2048.pem',
35+
292,
36+
'dff998a209bfa2e6ded1208c6e57f5b6bdedfa44b631265e3e244f38e637f6e4',
37+
],
38+
[
39+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
40+
342,
41+
'da0bcd53fbe3969c7cc2730f86abc34e0e1c340264bbdfa3faf01484c2eeece0',
42+
],
43+
] : [
44+
[
45+
'rsa_pss_cert_2048.pem',
46+
294,
47+
'4d4f2f076aced4f0df922b84b466b0a60ba4cb50a23d695ae12ddc5fff7aca14',
48+
],
49+
[
50+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
51+
294,
52+
'd37942c3bd02bc25c724fcd31efd647824e536c13d62d9ad0b5db8c0900d3cba',
53+
],
54+
];
55+
56+
for(const[name,length,digest]ofexpectedPubkeys){
57+
constpssCert=newX509Certificate(
58+
readFileSync(fixtures.path('keys',name)));
59+
constpubkey=pssCert.toLegacyObject().pubkey;
60+
assert.strictEqual(pubkey.length,length);
61+
assert.strictEqual(
62+
createHash('sha256').update(pubkey).digest('hex'),
63+
digest);
64+
}
65+
}
66+
3067
[1,{},false,null].forEach((i)=>{
3168
assert.throws(()=>newX509Certificate(i),{
3269
code: 'ERR_INVALID_ARG_TYPE'
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit b65a8f3
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: preserve RSA-PSS legacy pubkey DER
Recreate the historical rsaEncryption AlgorithmIdentifier used by
X509Certificate legacy pubkey output for restricted and unrestricted
RSA-PSS keys without relying on deprecated RSA APIs.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #64547
Backport-PR-URL: #65087
Refs: #64211
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 49f2ae2 commit b65a8f3
6 files changed
Lines changed: 182 additions & 1 deletion
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 94 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9393
}
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
96+
using ASN1StringPointer = DeleteFnPtr<ASN1_STRING, ASN1_STRING_free>;
9697
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
98+
using RsaPssParamsPointer = DeleteFnPtr<RSA_PSS_PARAMS, RSA_PSS_PARAMS_free>;
99+
using X509AlgorPointer = DeleteFnPtr<X509_ALGOR, X509_ALGOR_free>;
100+
using X509PubkeyPointer = DeleteFnPtr<X509_PUBKEY, X509_PUBKEY_free>;
97101
structOSSLParamDeleter {
98102
voidoperator()(OSSL_PARAM* params) const {
99103
if (params == nullptr) return;
@@ -5702,13 +5706,74 @@ bool ReadRsaPssParams(const EVP_PKEY* pkey, Rsa::PssParams* params) {
57025706

57035707
returntrue;
57045708
}
5709+
5710+
boolSetRsaPssHashAlgorithm(X509_ALGOR** out, const Digest& digest) {
5711+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5712+
5713+
 X509AlgorPointer algorithm(X509_ALGOR_new());
5714+
if (!algorithm) returnfalse;
5715+
X509_ALGOR_set_md(algorithm.get(), digest.get());
5716+
 *out = algorithm.release();
5717+
returntrue;
5718+
}
5719+
5720+
boolSetRsaPssMaskGenAlgorithm(X509_ALGOR** out, const Digest& digest) {
5721+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5722+
5723+
 X509AlgorPointer hash_algorithm(X509_ALGOR_new());
5724+
if (!hash_algorithm) returnfalse;
5725+
X509_ALGOR_set_md(hash_algorithm.get(), digest.get());
5726+
5727+
 ASN1StringPointer hash_algorithm_der(ASN1_item_pack(
5728+
 hash_algorithm.get(), ASN1_ITEM_rptr(X509_ALGOR), nullptr));
5729+
if (!hash_algorithm_der) returnfalse;
5730+
5731+
 X509AlgorPointer algorithm(X509_ALGOR_new());
5732+
if (!algorithm || X509_ALGOR_set0(algorithm.get(),
5733+
OBJ_nid2obj(NID_mgf1),
5734+
V_ASN1_SEQUENCE,
5735+
 hash_algorithm_der.get()) != 1) {
5736+
returnfalse;
5737+
 }
5738+
 hash_algorithm_der.release();
5739+
 *out = algorithm.release();
5740+
returntrue;
5741+
}
5742+
5743+
ASN1StringPointer EncodeRsaPssParams(const Rsa::PssParams& params) {
5744+
const Digest digest = Digest::FromName(params.digest.data());
5745+
if (!digest) return {};
5746+
5747+
const Digest mgf1_digest = params.mgf1_digest
5748+
 ? Digest::FromName(params.mgf1_digest->data())
5749+
 : digest;
5750+
if (!mgf1_digest) return {};
5751+
5752+
 RsaPssParamsPointer pss(RSA_PSS_PARAMS_new());
5753+
if (!pss || !SetRsaPssHashAlgorithm(&pss->hashAlgorithm, digest) ||
5754+
 !SetRsaPssMaskGenAlgorithm(&pss->maskGenAlgorithm, mgf1_digest)) {
5755+
return {};
5756+
 }
5757+
5758+
if (params.salt_length != 20) {
5759+
 pss->saltLength = ASN1_INTEGER_new();
5760+
if (pss->saltLength == nullptr ||
5761+
ASN1_INTEGER_set_int64(pss->saltLength, params.salt_length) != 1) {
5762+
return {};
5763+
 }
5764+
 }
5765+
5766+
returnASN1StringPointer(
5767+
ASN1_item_pack(pss.get(), ASN1_ITEM_rptr(RSA_PSS_PARAMS), nullptr));
5768+
}
57055769
} // namespace
57065770

57075771
Rsa::Rsa() : rsa_(false) {}
57085772

57095773
Rsa::Rsa(constEVP_PKEY* pkey) : Rsa() {
57105774
constint type = EVPKeyPointer::id(pkey);
57115775
if (type != EVP_PKEY_RSA && type != EVP_PKEY_RSA_PSS) return;
5776+
 rsa_pss_ = type == EVP_PKEY_RSA_PSS;
57125777
if (!GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_N, &n_) ||
57135778
 !GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_E, &e_)) {
57145779
return;
@@ -5804,7 +5869,35 @@ BIOPointer Rsa::derPublicKey() const {
58045869
if (!bio) return {};
58055870
#if NCRYPTO_USE_OPENSSL3_PROVIDER
58065871
auto pkey = EVPKeyPointer::NewRSA(*this);
5807-
if (!pkey || i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5872+
if (!pkey) return {};
5873+
if (!rsa_pss_) {
5874+
if (i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5875+
return bio;
5876+
 }
5877+
5878+
X509_PUBKEY* raw_pubkey = nullptr;
5879+
constint result = X509_PUBKEY_set(&raw_pubkey, pkey.get());
5880+
 X509PubkeyPointer pubkey(raw_pubkey);
5881+
if (result != 1) return {};
5882+
5883+
int parameter_type = V_ASN1_UNDEF;
5884+
 ASN1StringPointer parameters;
5885+
if (pss_params_) {
5886+
 parameters = EncodeRsaPssParams(*pss_params_);
5887+
if (!parameters) return {};
5888+
 parameter_type = V_ASN1_SEQUENCE;
5889+
 }
5890+
5891+
if (X509_PUBKEY_set0_param(pubkey.get(),
5892+
OBJ_nid2obj(NID_rsaEncryption),
5893+
 parameter_type,
5894+
 parameters.get(),
5895+
nullptr,
5896+
0) != 1) {
5897+
return {};
5898+
 }
5899+
 parameters.release();
5900+
if (i2d_X509_PUBKEY_bio(bio.get(), pubkey.get()) != 1) return {};
58085901
#else
58095902
if (rsa_ == nullptr || i2d_RSA_PUBKEY_bio(bio.get(), rsa_) != 1) return {};
58105903
#endif
‎deps/ncrypto/ncrypto.h‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,7 @@ class Rsa final {
639639
private:
640640
#if NCRYPTO_USE_OPENSSL3_PROVIDER
641641
bool rsa_ = false;
642+
bool rsa_pss_ = false;
642643
 DeleteFnPtr<BIGNUM, BN_free> n_;
643644
 DeleteFnPtr<BIGNUM, BN_free> e_;
644645
 DeleteFnPtr<BIGNUM, BN_clear_free> d_;
‎test/fixtures/keys/Makefile‎
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ all: \
7171
 rsa_private_4096.pem \
7272
 rsa_public_2048.pem \
7373
 rsa_public_4096.pem \
74+
 rsa_pss_cert_2048.pem \
75+
 rsa_pss_cert_2048_sha256_sha256_16.pem \
7476
 rsa_pss_private_2048.pem \
7577
 rsa_pss_private_2048_sha256_sha256_16.pem \
7678
 rsa_pss_private_2048_sha512_sha256_20.pem \
@@ -918,6 +920,12 @@ rsa_pss_private_2048_sha512_sha256_20.pem:
918920
rsa_pss_private_2048_sha1_sha1_20.pem:
919921
	openssl genpkey -algorithm RSA-PSS -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 -pkeyopt rsa_pss_keygen_md:sha1 -pkeyopt rsa_pss_keygen_mgf1_md:sha1 -pkeyopt rsa_pss_keygen_saltlen:20 -out rsa_pss_private_2048_sha1_sha1_20.pem
920922

923+
rsa_pss_cert_2048.pem: rsa_pss_private_2048.pem
924+
	openssl req -new -x509 -key rsa_pss_private_2048.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048.pem
925+
926+
rsa_pss_cert_2048_sha256_sha256_16.pem: rsa_pss_private_2048_sha256_sha256_16.pem
927+
	openssl req -new -x509 -key rsa_pss_private_2048_sha256_sha256_16.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048_sha256_sha256_16.pem
928+
921929
rsa_pss_public_2048.pem: rsa_pss_private_2048.pem
922930
	openssl pkey -in rsa_pss_private_2048.pem -pubout -out rsa_pss_public_2048.pem
923931

‎test/fixtures/keys/rsa_pss_cert_2048.pem‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDWjCCAg6gAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCASAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjE4MzJaGA8yMTI2MDYyMjIyMTgzMlowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCASAwCwYJKoZIhvcNAQEKA4IBDwAwggEKAoIBAQDLg4x1
6+
Lzg+WAjkJEtt1u531G7u+msWvZg01SZ1PsPdiACmK/wKPMpcuJUOdswRP6XCa1qD
7+
8RxmzFUIqi+y7fSlgBIGuIc6IxVi6L35lomhD3IjqU6MbVFu5QElc1KMcEnGoGqZ
8+
yBk5vWZ1Gv95fOkAxYneF+4uiNTb7NRInf+u96l6lwsUbar2cDT48myQns+eHcvT
9+
J2e/dTeF24yfk5V+b8nHUU/JmkPXzi0l9/434xjezeEhx+46cv0+XhE8Z5pMLhPW
10+
jjrQ1obpsbtzZaGDo05pWBoUhqI1utNM0KlWN5PJqWxNdiVBDeGIqOy3RDul8USQ
11+
kOjyqKotp3UyyXn3AgMBAAGjUzBRMB0GA1UdDgQWBBQDCGflRn9LTmklPpSFii4J
12+
fQiQjTAfBgNVHSMEGDAWgBQDCGflRn9LTmklPpSFii4JfQiQjTAPBgNVHRMBAf8E
13+
BTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG
14+
9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIAOCAQEAsXJk8iu+XNSmIheNPvzfSoNp
15+
7kkFqFjWRwo/a4vXb4Y7DRDsMeUM4dGNtN75Gj5bppnYtQ3ku/DWGLrVRPGs/sRx
16+
itOJxvJzPNCv4yYUwm8p8ua7l1Sdmrder84XTG/Dm3dOoUOxCmEQzzjghXE0mRih
17+
UC4aPyOGNHNlQg5YyEmfEnltlL12ls8cHE+5R56xeI34T/MukH0NVf7wNNfqrMqy
18+
PrrXG79+D3+Jeu3ddtwvoKQyQ/VuszJGjdplkDodttyTfu3GOgC/bbR9iz2GkcTV
19+
NEkjJHenMzpoAoNZukeuClOHF6NT3hBnKPmcZYlLPgIY1iOBYoGwctgb5pPxNg==
20+
-----END CERTIFICATE-----
‎test/fixtures/keys/rsa_pss_cert_2048_sha256_sha256_16.pem‎
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDkDCCAkSgAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCARAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjAyMzVaGA8yMTI2MDYyMjIyMDIzNVowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCAVYwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgEF
6+
AKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQMEAgEFAKIDAgEQA4IBDwAwggEKAoIB
7+
AQDfqNM4C+QtD73iILqOkqfV8ha3O19jpX8UujIk1Z72bbbuwEzh0+sBw0dD0N8C
8+
gkXnePOEEd6q7HNmbyCNqRpDK6NDvaCMDWgEaD/PlHkRntvKh81IXSMC5imjRfOc
9+
ZIE/Gnw7h8tanab0n75+ODvLJrmEWUG2q79Im1mWMx7Spod+Np6XEY+7I7nAUUWi
10+
vr35Yx5DeyxY8rxFGpsLtGsi7JNQO4aHyeBpj8tz0Fhv23uPywE2nGmPHfnkXWbr
11+
TcHGbzYBgEbeSH9KUkRwczqDXNOPhtfaEHEFTm0MoeKCnJe1VOjSywev77dV1KZf
12+
pVh3Kh0ZRQIe9YOVJhj4lMx3AgMBAAGjUzBRMB0GA1UdDgQWBBRrGC6N4gEM/Il9
13+
PMkKs+dhCbldkjAfBgNVHSMEGDAWgBRrGC6N4gEM/Il9PMkKs+dhCbldkjAPBgNV
14+
HRMBAf8EBTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAa
15+
BgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBEAOCAQEA1SP4HNSgQm2OpuRb
16+
VjEDyVANpCyuKjUFY0FAwart4YSKHwERuR5VccugGwlbnH0vKQ2uwTB/a5BlXssg
17+
0KB8qjDoOoxzhgZTA7yuHuQLpgCQhd00ORpxFYI1CyB+HywrpbuV4LHJoZjO7B6O
18+
Z0PPRs77023WkT/O4KRrFH8uaMgPMwUIjIGXzSp+TYObLnYTWmGyJ7rJVwOPH30z
19+
+BY++W0ZhkCuJveajuF3vGpA4o/lA0kcf6Hz2Prl28kHu0hOpZNTx2zMl+GFtlWE
20+
TIybjAvbA4TJW0rAURRuP4lhYsPJAnZDAnxHFvLeLKypfctv7eAc82U8rVjT+DIA
21+
NjayPQ==
22+
-----END CERTIFICATE-----
‎test/parallel/test-crypto-x509.js‎
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ if (!common.hasCrypto)
77

88
const{
99
 X509Certificate,
10+
 createHash,
1011
 createPrivateKey,
1112
 generateKeyPairSync,
1213
 createSign,
@@ -27,6 +28,42 @@ const ca = readFileSync(fixtures.path('keys', 'ca1-cert.pem'));
2728

2829
constprivateKey=createPrivateKey(key);
2930

31+
if(!process.features.openssl_is_boringssl){
32+
constexpectedPubkeys=hasOpenSSL3 ? [
33+
[
34+
'rsa_pss_cert_2048.pem',
35+
292,
36+
'dff998a209bfa2e6ded1208c6e57f5b6bdedfa44b631265e3e244f38e637f6e4',
37+
],
38+
[
39+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
40+
342,
41+
'da0bcd53fbe3969c7cc2730f86abc34e0e1c340264bbdfa3faf01484c2eeece0',
42+
],
43+
] : [
44+
[
45+
'rsa_pss_cert_2048.pem',
46+
294,
47+
'4d4f2f076aced4f0df922b84b466b0a60ba4cb50a23d695ae12ddc5fff7aca14',
48+
],
49+
[
50+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
51+
294,
52+
'd37942c3bd02bc25c724fcd31efd647824e536c13d62d9ad0b5db8c0900d3cba',
53+
],
54+
];
55+
56+
for(const[name,length,digest]ofexpectedPubkeys){
57+
constpssCert=newX509Certificate(
58+
readFileSync(fixtures.path('keys',name)));
59+
constpubkey=pssCert.toLegacyObject().pubkey;
60+
assert.strictEqual(pubkey.length,length);
61+
assert.strictEqual(
62+
createHash('sha256').update(pubkey).digest('hex'),
63+
digest);
64+
}
65+
}
66+
3067
[1,{},false,null].forEach((i)=>{
3168
assert.throws(()=>newX509Certificate(i),{
3269
code: 'ERR_INVALID_ARG_TYPE'
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit b65a8f3
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: preserve RSA-PSS legacy pubkey DER
Recreate the historical rsaEncryption AlgorithmIdentifier used by
X509Certificate legacy pubkey output for restricted and unrestricted
RSA-PSS keys without relying on deprecated RSA APIs.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #64547
Backport-PR-URL: #65087
Refs: #64211
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 49f2ae2 commit b65a8f3
6 files changed
Lines changed: 182 additions & 1 deletion
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 94 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9393
}
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
96+
using ASN1StringPointer = DeleteFnPtr<ASN1_STRING, ASN1_STRING_free>;
9697
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
98+
using RsaPssParamsPointer = DeleteFnPtr<RSA_PSS_PARAMS, RSA_PSS_PARAMS_free>;
99+
using X509AlgorPointer = DeleteFnPtr<X509_ALGOR, X509_ALGOR_free>;
100+
using X509PubkeyPointer = DeleteFnPtr<X509_PUBKEY, X509_PUBKEY_free>;
97101
structOSSLParamDeleter {
98102
voidoperator()(OSSL_PARAM* params) const {
99103
if (params == nullptr) return;
@@ -5702,13 +5706,74 @@ bool ReadRsaPssParams(const EVP_PKEY* pkey, Rsa::PssParams* params) {
57025706

57035707
returntrue;
57045708
}
5709+
5710+
boolSetRsaPssHashAlgorithm(X509_ALGOR** out, const Digest& digest) {
5711+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5712+
5713+
 X509AlgorPointer algorithm(X509_ALGOR_new());
5714+
if (!algorithm) returnfalse;
5715+
X509_ALGOR_set_md(algorithm.get(), digest.get());
5716+
 *out = algorithm.release();
5717+
returntrue;
5718+
}
5719+
5720+
boolSetRsaPssMaskGenAlgorithm(X509_ALGOR** out, const Digest& digest) {
5721+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5722+
5723+
 X509AlgorPointer hash_algorithm(X509_ALGOR_new());
5724+
if (!hash_algorithm) returnfalse;
5725+
X509_ALGOR_set_md(hash_algorithm.get(), digest.get());
5726+
5727+
 ASN1StringPointer hash_algorithm_der(ASN1_item_pack(
5728+
 hash_algorithm.get(), ASN1_ITEM_rptr(X509_ALGOR), nullptr));
5729+
if (!hash_algorithm_der) returnfalse;
5730+
5731+
 X509AlgorPointer algorithm(X509_ALGOR_new());
5732+
if (!algorithm || X509_ALGOR_set0(algorithm.get(),
5733+
OBJ_nid2obj(NID_mgf1),
5734+
V_ASN1_SEQUENCE,
5735+
 hash_algorithm_der.get()) != 1) {
5736+
returnfalse;
5737+
 }
5738+
 hash_algorithm_der.release();
5739+
 *out = algorithm.release();
5740+
returntrue;
5741+
}
5742+
5743+
ASN1StringPointer EncodeRsaPssParams(const Rsa::PssParams& params) {
5744+
const Digest digest = Digest::FromName(params.digest.data());
5745+
if (!digest) return {};
5746+
5747+
const Digest mgf1_digest = params.mgf1_digest
5748+
 ? Digest::FromName(params.mgf1_digest->data())
5749+
 : digest;
5750+
if (!mgf1_digest) return {};
5751+
5752+
 RsaPssParamsPointer pss(RSA_PSS_PARAMS_new());
5753+
if (!pss || !SetRsaPssHashAlgorithm(&pss->hashAlgorithm, digest) ||
5754+
 !SetRsaPssMaskGenAlgorithm(&pss->maskGenAlgorithm, mgf1_digest)) {
5755+
return {};
5756+
 }
5757+
5758+
if (params.salt_length != 20) {
5759+
 pss->saltLength = ASN1_INTEGER_new();
5760+
if (pss->saltLength == nullptr ||
5761+
ASN1_INTEGER_set_int64(pss->saltLength, params.salt_length) != 1) {
5762+
return {};
5763+
 }
5764+
 }
5765+
5766+
returnASN1StringPointer(
5767+
ASN1_item_pack(pss.get(), ASN1_ITEM_rptr(RSA_PSS_PARAMS), nullptr));
5768+
}
57055769
} // namespace
57065770

57075771
Rsa::Rsa() : rsa_(false) {}
57085772

57095773
Rsa::Rsa(constEVP_PKEY* pkey) : Rsa() {
57105774
constint type = EVPKeyPointer::id(pkey);
57115775
if (type != EVP_PKEY_RSA && type != EVP_PKEY_RSA_PSS) return;
5776+
 rsa_pss_ = type == EVP_PKEY_RSA_PSS;
57125777
if (!GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_N, &n_) ||
57135778
 !GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_E, &e_)) {
57145779
return;
@@ -5804,7 +5869,35 @@ BIOPointer Rsa::derPublicKey() const {
58045869
if (!bio) return {};
58055870
#if NCRYPTO_USE_OPENSSL3_PROVIDER
58065871
auto pkey = EVPKeyPointer::NewRSA(*this);
5807-
if (!pkey || i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5872+
if (!pkey) return {};
5873+
if (!rsa_pss_) {
5874+
if (i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5875+
return bio;
5876+
 }
5877+
5878+
X509_PUBKEY* raw_pubkey = nullptr;
5879+
constint result = X509_PUBKEY_set(&raw_pubkey, pkey.get());
5880+
 X509PubkeyPointer pubkey(raw_pubkey);
5881+
if (result != 1) return {};
5882+
5883+
int parameter_type = V_ASN1_UNDEF;
5884+
 ASN1StringPointer parameters;
5885+
if (pss_params_) {
5886+
 parameters = EncodeRsaPssParams(*pss_params_);
5887+
if (!parameters) return {};
5888+
 parameter_type = V_ASN1_SEQUENCE;
5889+
 }
5890+
5891+
if (X509_PUBKEY_set0_param(pubkey.get(),
5892+
OBJ_nid2obj(NID_rsaEncryption),
5893+
 parameter_type,
5894+
 parameters.get(),
5895+
nullptr,
5896+
0) != 1) {
5897+
return {};
5898+
 }
5899+
 parameters.release();
5900+
if (i2d_X509_PUBKEY_bio(bio.get(), pubkey.get()) != 1) return {};
58085901
#else
58095902
if (rsa_ == nullptr || i2d_RSA_PUBKEY_bio(bio.get(), rsa_) != 1) return {};
58105903
#endif
‎deps/ncrypto/ncrypto.h‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,7 @@ class Rsa final {
639639
private:
640640
#if NCRYPTO_USE_OPENSSL3_PROVIDER
641641
bool rsa_ = false;
642+
bool rsa_pss_ = false;
642643
 DeleteFnPtr<BIGNUM, BN_free> n_;
643644
 DeleteFnPtr<BIGNUM, BN_free> e_;
644645
 DeleteFnPtr<BIGNUM, BN_clear_free> d_;
‎test/fixtures/keys/Makefile‎
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ all: \
7171
 rsa_private_4096.pem \
7272
 rsa_public_2048.pem \
7373
 rsa_public_4096.pem \
74+
 rsa_pss_cert_2048.pem \
75+
 rsa_pss_cert_2048_sha256_sha256_16.pem \
7476
 rsa_pss_private_2048.pem \
7577
 rsa_pss_private_2048_sha256_sha256_16.pem \
7678
 rsa_pss_private_2048_sha512_sha256_20.pem \
@@ -918,6 +920,12 @@ rsa_pss_private_2048_sha512_sha256_20.pem:
918920
rsa_pss_private_2048_sha1_sha1_20.pem:
919921
	openssl genpkey -algorithm RSA-PSS -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 -pkeyopt rsa_pss_keygen_md:sha1 -pkeyopt rsa_pss_keygen_mgf1_md:sha1 -pkeyopt rsa_pss_keygen_saltlen:20 -out rsa_pss_private_2048_sha1_sha1_20.pem
920922

923+
rsa_pss_cert_2048.pem: rsa_pss_private_2048.pem
924+
	openssl req -new -x509 -key rsa_pss_private_2048.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048.pem
925+
926+
rsa_pss_cert_2048_sha256_sha256_16.pem: rsa_pss_private_2048_sha256_sha256_16.pem
927+
	openssl req -new -x509 -key rsa_pss_private_2048_sha256_sha256_16.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048_sha256_sha256_16.pem
928+
921929
rsa_pss_public_2048.pem: rsa_pss_private_2048.pem
922930
	openssl pkey -in rsa_pss_private_2048.pem -pubout -out rsa_pss_public_2048.pem
923931

‎test/fixtures/keys/rsa_pss_cert_2048.pem‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDWjCCAg6gAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCASAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjE4MzJaGA8yMTI2MDYyMjIyMTgzMlowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCASAwCwYJKoZIhvcNAQEKA4IBDwAwggEKAoIBAQDLg4x1
6+
Lzg+WAjkJEtt1u531G7u+msWvZg01SZ1PsPdiACmK/wKPMpcuJUOdswRP6XCa1qD
7+
8RxmzFUIqi+y7fSlgBIGuIc6IxVi6L35lomhD3IjqU6MbVFu5QElc1KMcEnGoGqZ
8+
yBk5vWZ1Gv95fOkAxYneF+4uiNTb7NRInf+u96l6lwsUbar2cDT48myQns+eHcvT
9+
J2e/dTeF24yfk5V+b8nHUU/JmkPXzi0l9/434xjezeEhx+46cv0+XhE8Z5pMLhPW
10+
jjrQ1obpsbtzZaGDo05pWBoUhqI1utNM0KlWN5PJqWxNdiVBDeGIqOy3RDul8USQ
11+
kOjyqKotp3UyyXn3AgMBAAGjUzBRMB0GA1UdDgQWBBQDCGflRn9LTmklPpSFii4J
12+
fQiQjTAfBgNVHSMEGDAWgBQDCGflRn9LTmklPpSFii4JfQiQjTAPBgNVHRMBAf8E
13+
BTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG
14+
9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIAOCAQEAsXJk8iu+XNSmIheNPvzfSoNp
15+
7kkFqFjWRwo/a4vXb4Y7DRDsMeUM4dGNtN75Gj5bppnYtQ3ku/DWGLrVRPGs/sRx
16+
itOJxvJzPNCv4yYUwm8p8ua7l1Sdmrder84XTG/Dm3dOoUOxCmEQzzjghXE0mRih
17+
UC4aPyOGNHNlQg5YyEmfEnltlL12ls8cHE+5R56xeI34T/MukH0NVf7wNNfqrMqy
18+
PrrXG79+D3+Jeu3ddtwvoKQyQ/VuszJGjdplkDodttyTfu3GOgC/bbR9iz2GkcTV
19+
NEkjJHenMzpoAoNZukeuClOHF6NT3hBnKPmcZYlLPgIY1iOBYoGwctgb5pPxNg==
20+
-----END CERTIFICATE-----
‎test/fixtures/keys/rsa_pss_cert_2048_sha256_sha256_16.pem‎
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDkDCCAkSgAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCARAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjAyMzVaGA8yMTI2MDYyMjIyMDIzNVowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCAVYwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgEF
6+
AKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQMEAgEFAKIDAgEQA4IBDwAwggEKAoIB
7+
AQDfqNM4C+QtD73iILqOkqfV8ha3O19jpX8UujIk1Z72bbbuwEzh0+sBw0dD0N8C
8+
gkXnePOEEd6q7HNmbyCNqRpDK6NDvaCMDWgEaD/PlHkRntvKh81IXSMC5imjRfOc
9+
ZIE/Gnw7h8tanab0n75+ODvLJrmEWUG2q79Im1mWMx7Spod+Np6XEY+7I7nAUUWi
10+
vr35Yx5DeyxY8rxFGpsLtGsi7JNQO4aHyeBpj8tz0Fhv23uPywE2nGmPHfnkXWbr
11+
TcHGbzYBgEbeSH9KUkRwczqDXNOPhtfaEHEFTm0MoeKCnJe1VOjSywev77dV1KZf
12+
pVh3Kh0ZRQIe9YOVJhj4lMx3AgMBAAGjUzBRMB0GA1UdDgQWBBRrGC6N4gEM/Il9
13+
PMkKs+dhCbldkjAfBgNVHSMEGDAWgBRrGC6N4gEM/Il9PMkKs+dhCbldkjAPBgNV
14+
HRMBAf8EBTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAa
15+
BgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBEAOCAQEA1SP4HNSgQm2OpuRb
16+
VjEDyVANpCyuKjUFY0FAwart4YSKHwERuR5VccugGwlbnH0vKQ2uwTB/a5BlXssg
17+
0KB8qjDoOoxzhgZTA7yuHuQLpgCQhd00ORpxFYI1CyB+HywrpbuV4LHJoZjO7B6O
18+
Z0PPRs77023WkT/O4KRrFH8uaMgPMwUIjIGXzSp+TYObLnYTWmGyJ7rJVwOPH30z
19+
+BY++W0ZhkCuJveajuF3vGpA4o/lA0kcf6Hz2Prl28kHu0hOpZNTx2zMl+GFtlWE
20+
TIybjAvbA4TJW0rAURRuP4lhYsPJAnZDAnxHFvLeLKypfctv7eAc82U8rVjT+DIA
21+
NjayPQ==
22+
-----END CERTIFICATE-----
‎test/parallel/test-crypto-x509.js‎
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ if (!common.hasCrypto)
77

88
const{
99
 X509Certificate,
10+
 createHash,
1011
 createPrivateKey,
1112
 generateKeyPairSync,
1213
 createSign,
@@ -27,6 +28,42 @@ const ca = readFileSync(fixtures.path('keys', 'ca1-cert.pem'));
2728

2829
constprivateKey=createPrivateKey(key);
2930

31+
if(!process.features.openssl_is_boringssl){
32+
constexpectedPubkeys=hasOpenSSL3 ? [
33+
[
34+
'rsa_pss_cert_2048.pem',
35+
292,
36+
'dff998a209bfa2e6ded1208c6e57f5b6bdedfa44b631265e3e244f38e637f6e4',
37+
],
38+
[
39+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
40+
342,
41+
'da0bcd53fbe3969c7cc2730f86abc34e0e1c340264bbdfa3faf01484c2eeece0',
42+
],
43+
] : [
44+
[
45+
'rsa_pss_cert_2048.pem',
46+
294,
47+
'4d4f2f076aced4f0df922b84b466b0a60ba4cb50a23d695ae12ddc5fff7aca14',
48+
],
49+
[
50+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
51+
294,
52+
'd37942c3bd02bc25c724fcd31efd647824e536c13d62d9ad0b5db8c0900d3cba',
53+
],
54+
];
55+
56+
for(const[name,length,digest]ofexpectedPubkeys){
57+
constpssCert=newX509Certificate(
58+
readFileSync(fixtures.path('keys',name)));
59+
constpubkey=pssCert.toLegacyObject().pubkey;
60+
assert.strictEqual(pubkey.length,length);
61+
assert.strictEqual(
62+
createHash('sha256').update(pubkey).digest('hex'),
63+
digest);
64+
}
65+
}
66+
3067
[1,{},false,null].forEach((i)=>{
3168
assert.throws(()=>newX509Certificate(i),{
3269
code: 'ERR_INVALID_ARG_TYPE'
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit b65a8f3
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: preserve RSA-PSS legacy pubkey DER
Recreate the historical rsaEncryption AlgorithmIdentifier used by
X509Certificate legacy pubkey output for restricted and unrestricted
RSA-PSS keys without relying on deprecated RSA APIs.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #64547
Backport-PR-URL: #65087
Refs: #64211
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 49f2ae2 commit b65a8f3
6 files changed
Lines changed: 182 additions & 1 deletion
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 94 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9393
}
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
96+
using ASN1StringPointer = DeleteFnPtr<ASN1_STRING, ASN1_STRING_free>;
9697
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
98+
using RsaPssParamsPointer = DeleteFnPtr<RSA_PSS_PARAMS, RSA_PSS_PARAMS_free>;
99+
using X509AlgorPointer = DeleteFnPtr<X509_ALGOR, X509_ALGOR_free>;
100+
using X509PubkeyPointer = DeleteFnPtr<X509_PUBKEY, X509_PUBKEY_free>;
97101
structOSSLParamDeleter {
98102
voidoperator()(OSSL_PARAM* params) const {
99103
if (params == nullptr) return;
@@ -5702,13 +5706,74 @@ bool ReadRsaPssParams(const EVP_PKEY* pkey, Rsa::PssParams* params) {
57025706

57035707
returntrue;
57045708
}
5709+
5710+
boolSetRsaPssHashAlgorithm(X509_ALGOR** out, const Digest& digest) {
5711+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5712+
5713+
 X509AlgorPointer algorithm(X509_ALGOR_new());
5714+
if (!algorithm) returnfalse;
5715+
X509_ALGOR_set_md(algorithm.get(), digest.get());
5716+
 *out = algorithm.release();
5717+
returntrue;
5718+
}
5719+
5720+
boolSetRsaPssMaskGenAlgorithm(X509_ALGOR** out, const Digest& digest) {
5721+
if (EVP_MD_is_a(digest.get(), "SHA1")) returntrue;
5722+
5723+
 X509AlgorPointer hash_algorithm(X509_ALGOR_new());
5724+
if (!hash_algorithm) returnfalse;
5725+
X509_ALGOR_set_md(hash_algorithm.get(), digest.get());
5726+
5727+
 ASN1StringPointer hash_algorithm_der(ASN1_item_pack(
5728+
 hash_algorithm.get(), ASN1_ITEM_rptr(X509_ALGOR), nullptr));
5729+
if (!hash_algorithm_der) returnfalse;
5730+
5731+
 X509AlgorPointer algorithm(X509_ALGOR_new());
5732+
if (!algorithm || X509_ALGOR_set0(algorithm.get(),
5733+
OBJ_nid2obj(NID_mgf1),
5734+
V_ASN1_SEQUENCE,
5735+
 hash_algorithm_der.get()) != 1) {
5736+
returnfalse;
5737+
 }
5738+
 hash_algorithm_der.release();
5739+
 *out = algorithm.release();
5740+
returntrue;
5741+
}
5742+
5743+
ASN1StringPointer EncodeRsaPssParams(const Rsa::PssParams& params) {
5744+
const Digest digest = Digest::FromName(params.digest.data());
5745+
if (!digest) return {};
5746+
5747+
const Digest mgf1_digest = params.mgf1_digest
5748+
 ? Digest::FromName(params.mgf1_digest->data())
5749+
 : digest;
5750+
if (!mgf1_digest) return {};
5751+
5752+
 RsaPssParamsPointer pss(RSA_PSS_PARAMS_new());
5753+
if (!pss || !SetRsaPssHashAlgorithm(&pss->hashAlgorithm, digest) ||
5754+
 !SetRsaPssMaskGenAlgorithm(&pss->maskGenAlgorithm, mgf1_digest)) {
5755+
return {};
5756+
 }
5757+
5758+
if (params.salt_length != 20) {
5759+
 pss->saltLength = ASN1_INTEGER_new();
5760+
if (pss->saltLength == nullptr ||
5761+
ASN1_INTEGER_set_int64(pss->saltLength, params.salt_length) != 1) {
5762+
return {};
5763+
 }
5764+
 }
5765+
5766+
returnASN1StringPointer(
5767+
ASN1_item_pack(pss.get(), ASN1_ITEM_rptr(RSA_PSS_PARAMS), nullptr));
5768+
}
57055769
} // namespace
57065770

57075771
Rsa::Rsa() : rsa_(false) {}
57085772

57095773
Rsa::Rsa(constEVP_PKEY* pkey) : Rsa() {
57105774
constint type = EVPKeyPointer::id(pkey);
57115775
if (type != EVP_PKEY_RSA && type != EVP_PKEY_RSA_PSS) return;
5776+
 rsa_pss_ = type == EVP_PKEY_RSA_PSS;
57125777
if (!GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_N, &n_) ||
57135778
 !GetPKeyBnParam(pkey, OSSL_PKEY_PARAM_RSA_E, &e_)) {
57145779
return;
@@ -5804,7 +5869,35 @@ BIOPointer Rsa::derPublicKey() const {
58045869
if (!bio) return {};
58055870
#if NCRYPTO_USE_OPENSSL3_PROVIDER
58065871
auto pkey = EVPKeyPointer::NewRSA(*this);
5807-
if (!pkey || i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5872+
if (!pkey) return {};
5873+
if (!rsa_pss_) {
5874+
if (i2d_PUBKEY_bio(bio.get(), pkey.get()) != 1) return {};
5875+
return bio;
5876+
 }
5877+
5878+
X509_PUBKEY* raw_pubkey = nullptr;
5879+
constint result = X509_PUBKEY_set(&raw_pubkey, pkey.get());
5880+
 X509PubkeyPointer pubkey(raw_pubkey);
5881+
if (result != 1) return {};
5882+
5883+
int parameter_type = V_ASN1_UNDEF;
5884+
 ASN1StringPointer parameters;
5885+
if (pss_params_) {
5886+
 parameters = EncodeRsaPssParams(*pss_params_);
5887+
if (!parameters) return {};
5888+
 parameter_type = V_ASN1_SEQUENCE;
5889+
 }
5890+
5891+
if (X509_PUBKEY_set0_param(pubkey.get(),
5892+
OBJ_nid2obj(NID_rsaEncryption),
5893+
 parameter_type,
5894+
 parameters.get(),
5895+
nullptr,
5896+
0) != 1) {
5897+
return {};
5898+
 }
5899+
 parameters.release();
5900+
if (i2d_X509_PUBKEY_bio(bio.get(), pubkey.get()) != 1) return {};
58085901
#else
58095902
if (rsa_ == nullptr || i2d_RSA_PUBKEY_bio(bio.get(), rsa_) != 1) return {};
58105903
#endif
‎deps/ncrypto/ncrypto.h‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,7 @@ class Rsa final {
639639
private:
640640
#if NCRYPTO_USE_OPENSSL3_PROVIDER
641641
bool rsa_ = false;
642+
bool rsa_pss_ = false;
642643
 DeleteFnPtr<BIGNUM, BN_free> n_;
643644
 DeleteFnPtr<BIGNUM, BN_free> e_;
644645
 DeleteFnPtr<BIGNUM, BN_clear_free> d_;
‎test/fixtures/keys/Makefile‎
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ all: \
7171
 rsa_private_4096.pem \
7272
 rsa_public_2048.pem \
7373
 rsa_public_4096.pem \
74+
 rsa_pss_cert_2048.pem \
75+
 rsa_pss_cert_2048_sha256_sha256_16.pem \
7476
 rsa_pss_private_2048.pem \
7577
 rsa_pss_private_2048_sha256_sha256_16.pem \
7678
 rsa_pss_private_2048_sha512_sha256_20.pem \
@@ -918,6 +920,12 @@ rsa_pss_private_2048_sha512_sha256_20.pem:
918920
rsa_pss_private_2048_sha1_sha1_20.pem:
919921
	openssl genpkey -algorithm RSA-PSS -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 -pkeyopt rsa_pss_keygen_md:sha1 -pkeyopt rsa_pss_keygen_mgf1_md:sha1 -pkeyopt rsa_pss_keygen_saltlen:20 -out rsa_pss_private_2048_sha1_sha1_20.pem
920922

923+
rsa_pss_cert_2048.pem: rsa_pss_private_2048.pem
924+
	openssl req -new -x509 -key rsa_pss_private_2048.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048.pem
925+
926+
rsa_pss_cert_2048_sha256_sha256_16.pem: rsa_pss_private_2048_sha256_sha256_16.pem
927+
	openssl req -new -x509 -key rsa_pss_private_2048_sha256_sha256_16.pem -subj "/CN=Node.js" -days 36500 -set_serial 1 -out rsa_pss_cert_2048_sha256_sha256_16.pem
928+
921929
rsa_pss_public_2048.pem: rsa_pss_private_2048.pem
922930
	openssl pkey -in rsa_pss_private_2048.pem -pubout -out rsa_pss_public_2048.pem
923931

‎test/fixtures/keys/rsa_pss_cert_2048.pem‎
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDWjCCAg6gAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCASAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjE4MzJaGA8yMTI2MDYyMjIyMTgzMlowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCASAwCwYJKoZIhvcNAQEKA4IBDwAwggEKAoIBAQDLg4x1
6+
Lzg+WAjkJEtt1u531G7u+msWvZg01SZ1PsPdiACmK/wKPMpcuJUOdswRP6XCa1qD
7+
8RxmzFUIqi+y7fSlgBIGuIc6IxVi6L35lomhD3IjqU6MbVFu5QElc1KMcEnGoGqZ
8+
yBk5vWZ1Gv95fOkAxYneF+4uiNTb7NRInf+u96l6lwsUbar2cDT48myQns+eHcvT
9+
J2e/dTeF24yfk5V+b8nHUU/JmkPXzi0l9/434xjezeEhx+46cv0+XhE8Z5pMLhPW
10+
jjrQ1obpsbtzZaGDo05pWBoUhqI1utNM0KlWN5PJqWxNdiVBDeGIqOy3RDul8USQ
11+
kOjyqKotp3UyyXn3AgMBAAGjUzBRMB0GA1UdDgQWBBQDCGflRn9LTmklPpSFii4J
12+
fQiQjTAfBgNVHSMEGDAWgBQDCGflRn9LTmklPpSFii4JfQiQjTAPBgNVHRMBAf8E
13+
BTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAaBgkqhkiG
14+
9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIAOCAQEAsXJk8iu+XNSmIheNPvzfSoNp
15+
7kkFqFjWRwo/a4vXb4Y7DRDsMeUM4dGNtN75Gj5bppnYtQ3ku/DWGLrVRPGs/sRx
16+
itOJxvJzPNCv4yYUwm8p8ua7l1Sdmrder84XTG/Dm3dOoUOxCmEQzzjghXE0mRih
17+
UC4aPyOGNHNlQg5YyEmfEnltlL12ls8cHE+5R56xeI34T/MukH0NVf7wNNfqrMqy
18+
PrrXG79+D3+Jeu3ddtwvoKQyQ/VuszJGjdplkDodttyTfu3GOgC/bbR9iz2GkcTV
19+
NEkjJHenMzpoAoNZukeuClOHF6NT3hBnKPmcZYlLPgIY1iOBYoGwctgb5pPxNg==
20+
-----END CERTIFICATE-----
‎test/fixtures/keys/rsa_pss_cert_2048_sha256_sha256_16.pem‎
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDkDCCAkSgAwIBAgIBATBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAQUA
3+
oRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUAogMCARAwEjEQMA4GA1UEAwwH
4+
Tm9kZS5qczAgFw0yNjA3MTYyMjAyMzVaGA8yMTI2MDYyMjIyMDIzNVowEjEQMA4G
5+
A1UEAwwHTm9kZS5qczCCAVYwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgEF
6+
AKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQMEAgEFAKIDAgEQA4IBDwAwggEKAoIB
7+
AQDfqNM4C+QtD73iILqOkqfV8ha3O19jpX8UujIk1Z72bbbuwEzh0+sBw0dD0N8C
8+
gkXnePOEEd6q7HNmbyCNqRpDK6NDvaCMDWgEaD/PlHkRntvKh81IXSMC5imjRfOc
9+
ZIE/Gnw7h8tanab0n75+ODvLJrmEWUG2q79Im1mWMx7Spod+Np6XEY+7I7nAUUWi
10+
vr35Yx5DeyxY8rxFGpsLtGsi7JNQO4aHyeBpj8tz0Fhv23uPywE2nGmPHfnkXWbr
11+
TcHGbzYBgEbeSH9KUkRwczqDXNOPhtfaEHEFTm0MoeKCnJe1VOjSywev77dV1KZf
12+
pVh3Kh0ZRQIe9YOVJhj4lMx3AgMBAAGjUzBRMB0GA1UdDgQWBBRrGC6N4gEM/Il9
13+
PMkKs+dhCbldkjAfBgNVHSMEGDAWgBRrGC6N4gEM/Il9PMkKs+dhCbldkjAPBgNV
14+
HRMBAf8EBTADAQH/MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUDBAIBBQChHDAa
15+
BgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBEAOCAQEA1SP4HNSgQm2OpuRb
16+
VjEDyVANpCyuKjUFY0FAwart4YSKHwERuR5VccugGwlbnH0vKQ2uwTB/a5BlXssg
17+
0KB8qjDoOoxzhgZTA7yuHuQLpgCQhd00ORpxFYI1CyB+HywrpbuV4LHJoZjO7B6O
18+
Z0PPRs77023WkT/O4KRrFH8uaMgPMwUIjIGXzSp+TYObLnYTWmGyJ7rJVwOPH30z
19+
+BY++W0ZhkCuJveajuF3vGpA4o/lA0kcf6Hz2Prl28kHu0hOpZNTx2zMl+GFtlWE
20+
TIybjAvbA4TJW0rAURRuP4lhYsPJAnZDAnxHFvLeLKypfctv7eAc82U8rVjT+DIA
21+
NjayPQ==
22+
-----END CERTIFICATE-----
‎test/parallel/test-crypto-x509.js‎
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ if (!common.hasCrypto)
77

88
const{
99
 X509Certificate,
10+
 createHash,
1011
 createPrivateKey,
1112
 generateKeyPairSync,
1213
 createSign,
@@ -27,6 +28,42 @@ const ca = readFileSync(fixtures.path('keys', 'ca1-cert.pem'));
2728

2829
constprivateKey=createPrivateKey(key);
2930

31+
if(!process.features.openssl_is_boringssl){
32+
constexpectedPubkeys=hasOpenSSL3 ? [
33+
[
34+
'rsa_pss_cert_2048.pem',
35+
292,
36+
'dff998a209bfa2e6ded1208c6e57f5b6bdedfa44b631265e3e244f38e637f6e4',
37+
],
38+
[
39+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
40+
342,
41+
'da0bcd53fbe3969c7cc2730f86abc34e0e1c340264bbdfa3faf01484c2eeece0',
42+
],
43+
] : [
44+
[
45+
'rsa_pss_cert_2048.pem',
46+
294,
47+
'4d4f2f076aced4f0df922b84b466b0a60ba4cb50a23d695ae12ddc5fff7aca14',
48+
],
49+
[
50+
'rsa_pss_cert_2048_sha256_sha256_16.pem',
51+
294,
52+
'd37942c3bd02bc25c724fcd31efd647824e536c13d62d9ad0b5db8c0900d3cba',
53+
],
54+
];
55+
56+
for(const[name,length,digest]ofexpectedPubkeys){
57+
constpssCert=newX509Certificate(
58+
readFileSync(fixtures.path('keys',name)));
59+
constpubkey=pssCert.toLegacyObject().pubkey;
60+
assert.strictEqual(pubkey.length,length);
61+
assert.strictEqual(
62+
createHash('sha256').update(pubkey).digest('hex'),
63+
digest);
64+
}
65+
}
66+
3067
[1,{},false,null].forEach((i)=>{
3168
assert.throws(()=>newX509Certificate(i),{
3269
code: 'ERR_INVALID_ARG_TYPE'
0 commit comments
Comments
 (0)