Commit 49f2ae2

Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: cleanse provider private key copies
Clear provider-exported RSA, EC, and DH private BIGNUMs before freeing them. Also cleanse OSSL_PARAM builder copies and the plaintext DER intermediate used for encrypted traditional PEM output. 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 a5d4ac8 commit 49f2ae2

2 files changed

Lines changed: 45 additions & 35 deletions

File tree

‎deps/ncrypto/ncrypto.cc‎

Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,19 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
9696
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
97-
using OSSLParamPointer = DeleteFnPtr<OSSL_PARAM, OSSL_PARAM_free>;
97+
structOSSLParamDeleter {
98+
voidoperator()(OSSL_PARAM* params) const {
99+
if (params == nullptr) return;
100+
for (OSSL_PARAM* param = params; param->key != nullptr; param++) {
101+
if (param->data != nullptr && param->data_type != OSSL_PARAM_UTF8_PTR &&
102+
param->data_type != OSSL_PARAM_OCTET_PTR) {
103+
OPENSSL_cleanse(param->data, param->data_size);
104+
}
105+
}
106+
OSSL_PARAM_free(params);
107+
}
108+
};
109+
using OSSLParamPointer = std::unique_ptr<OSSL_PARAM, OSSLParamDeleter>;
98110
structOpenSSLBufferDeleter {
99111
voidoperator()(unsignedchar* pointer) const { OPENSSL_free(pointer); }
100112
};
@@ -106,9 +118,8 @@ static constexpr int kX509NameFlagsRFC2253WithinUtf8JSON =
106118
XN_FLAG_RFC2253 & ~ASN1_STRFLGS_ESC_MSB & ~ASN1_STRFLGS_ESC_CTRL;
107119

108120
#if NCRYPTO_USE_OPENSSL3_PROVIDER
109-
boolGetPKeyBnParam(constEVP_PKEY* pkey,
110-
constchar* name,
111-
DeleteFnPtr<BIGNUM, BN_free>* out) {
121+
template <typename Pointer>
122+
boolGetPKeyBnParam(constEVP_PKEY* pkey, constchar* name, Pointer* out) {
112123
BIGNUM* bn = nullptr;
113124
if (pkey == nullptr) returnfalse;
114125
if (EVP_PKEY_get_bn_param(pkey, name, &bn) == 1) {
@@ -135,9 +146,10 @@ bool GetPKeyBnParam(const EVP_PKEY* pkey,
135146
returntrue;
136147
}
137148

149+
template <typename Pointer>
138150
boolGetOptionalPKeyBnParam(constEVP_PKEY* pkey,
139151
constchar* name,
140-
DeleteFnPtr<BIGNUM, BN_free>* out) {
152+
Pointer* out) {
141153
BIGNUM* bn = nullptr;
142154
if (pkey == nullptr) {
143155
out->reset();
@@ -273,9 +285,11 @@ bool GetDhParams(const EVP_PKEY* pkey,
273285

274286
boolGetDhKeys(constEVP_PKEY* pkey,
275287
DeleteFnPtr<BIGNUM, BN_free>* pub,
276-
DeleteFnPtr<BIGNUM, BN_free>* priv) {
277-
returnGetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub) &&
278-
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv);
288+
DeleteFnPtr<BIGNUM, BN_clear_free>* priv) {
289+
return (pub == nullptr ||
290+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub)) &&
291+
(priv == nullptr ||
292+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv));
279293
}
280294
#endif
281295

@@ -2290,8 +2304,7 @@ DataPointer DHPointer::getPublicKey() const {
22902304
if (!dh_) return {};
22912305

22922306
DeleteFnPtr<BIGNUM, BN_free> pub_key;
2293-
DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2294-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2307+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) return {};
22952308
returnBignumPointer::Encode(pub_key.get());
22962309
#else
22972310
constBIGNUM* pub_key;
@@ -2306,9 +2319,8 @@ DataPointer DHPointer::getPrivateKey() const {
23062319
if (pvt_key_) return pvt_key_.encode();
23072320
if (!dh_) return {};
23082321

2309-
DeleteFnPtr<BIGNUM, BN_free> pub_key;
2310-
DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2311-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2322+
DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2323+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) return {};
23122324
returnBignumPointer::Encode(pvt_key.get());
23132325
#else
23142326
constBIGNUM* pvt_key;
@@ -2323,9 +2335,8 @@ bool DHPointer::hasPrivateKey() const {
23232335
if (pvt_key_) returntrue;
23242336
if (!dh_) returnfalse;
23252337

2326-
DeleteFnPtr<BIGNUM, BN_free> pub_key;
2327-
DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2328-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) returnfalse;
2338+
DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2339+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) returnfalse;
23292340
return pvt_key != nullptr;
23302341
#else
23312342
constBIGNUM* pvt_key = nullptr;
@@ -2361,7 +2372,7 @@ DataPointer DHPointer::generateKeys() {
23612372
DeleteFnPtr<BIGNUM, BN_free> p;
23622373
DeleteFnPtr<BIGNUM, BN_free> g;
23632374
DeleteFnPtr<BIGNUM, BN_free> pub_key;
2364-
DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2375+
DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
23652376
if (!GetDhParams(dh_.get(), &p, &g) ||
23662377
!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
23672378
return {};
@@ -2496,9 +2507,8 @@ bool DHPointer::setPublicKey(BignumPointer&& key) {
24962507
returntrue;
24972508
}
24982509

2499-
DeleteFnPtr<BIGNUM, BN_free> pub_key;
2500-
DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2501-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2510+
DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2511+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) {
25022512
returnfalse;
25032513
}
25042514
EVPKeyPointer pkey;
@@ -2535,8 +2545,7 @@ bool DHPointer::setPrivateKey(BignumPointer&& key) {
25352545
}
25362546

25372547
DeleteFnPtr<BIGNUM, BN_free> pub_key;
2538-
DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2539-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2548+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) {
25402549
returnfalse;
25412550
}
25422551
EVPKeyPointer pkey;
@@ -3537,12 +3546,13 @@ bool WriteEncryptedTraditionalPEM(BIO* bio,
35373546
size_t der_len = 0;
35383547
OSSLEncoderCtxPointer ctx(OSSL_ENCODER_CTX_new_for_pkey(
35393548
pkey, OSSL_KEYMGMT_SELECT_KEYPAIR, "DER", "pkcs1", nullptr));
3540-
if (!ctx || OSSL_ENCODER_to_data(ctx.get(), &der, &der_len) != 1) {
3541-
returnfalse;
3542-
}
3549+
if (!ctx) returnfalse;
3550+
3551+
constint result = OSSL_ENCODER_to_data(ctx.get(), &der, &der_len);
3552+
DataPointer der_storage(der, der_len);
3553+
if (result != 1) returnfalse;
35433554

3544-
OpenSSLBufferPointer der_storage(der);
3545-
DERView der_view{der_storage.get(), der_len};
3555+
DERView der_view{der_storage.get<constunsignedchar>(), der_len};
35463556
returnPEM_ASN1_write_bio(
35473557
WriteDERView,
35483558
PEM_STRING_RSA,
@@ -4977,7 +4987,7 @@ bool ECKeyPointer::generate() {
49774987
if (EVP_PKEY_keygen(ctx.get(), &raw) != 1) returnfalse;
49784988
EVPKeyPointer pkey(raw);
49794989

4980-
DeleteFnPtr<BIGNUM, BN_free> priv;
4990+
DeleteFnPtr<BIGNUM, BN_clear_free> priv;
49814991
if (!GetPKeyBnParam(pkey.get(), OSSL_PKEY_PARAM_PRIV_KEY, &priv)) {
49824992
returnfalse;
49834993
}

‎deps/ncrypto/ncrypto.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -641,12 +641,12 @@ class Rsa final {
641641
bool rsa_ = false;
642642
DeleteFnPtr<BIGNUM, BN_free> n_;
643643
DeleteFnPtr<BIGNUM, BN_free> e_;
644-
DeleteFnPtr<BIGNUM, BN_free> d_;
645-
DeleteFnPtr<BIGNUM, BN_free> p_;
646-
DeleteFnPtr<BIGNUM, BN_free> q_;
647-
DeleteFnPtr<BIGNUM, BN_free> dp_;
648-
DeleteFnPtr<BIGNUM, BN_free> dq_;
649-
DeleteFnPtr<BIGNUM, BN_free> qi_;
644+
DeleteFnPtr<BIGNUM, BN_clear_free> d_;
645+
DeleteFnPtr<BIGNUM, BN_clear_free> p_;
646+
DeleteFnPtr<BIGNUM, BN_clear_free> q_;
647+
DeleteFnPtr<BIGNUM, BN_clear_free> dp_;
648+
DeleteFnPtr<BIGNUM, BN_clear_free> dq_;
649+
DeleteFnPtr<BIGNUM, BN_clear_free> qi_;
650650
std::optional<PssParams> pss_params_;
651651
#else
652652
OSSL3_CONSTRSA* rsa_;
@@ -1634,7 +1634,7 @@ class ECKeyPointer final {
16341634
#if NCRYPTO_USE_OPENSSL3_PROVIDER
16351635
DeleteFnPtr<EC_GROUP, EC_GROUP_free> group_;
16361636
DeleteFnPtr<EC_POINT, EC_POINT_free> pub_;
1637-
DeleteFnPtr<BIGNUM, BN_free> priv_;
1637+
DeleteFnPtr<BIGNUM, BN_clear_free> priv_;
16381638
#else
16391639
DeleteFnPtr<EC_KEY, EC_KEY_free> key_;
16401640
#endif

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 49f2ae2
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: cleanse provider private key copies
Clear provider-exported RSA, EC, and DH private BIGNUMs before freeing
them. Also cleanse OSSL_PARAM builder copies and the plaintext DER
intermediate used for encrypted traditional PEM output.
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 a5d4ac8 commit 49f2ae2
2 files changed
Lines changed: 45 additions & 35 deletions
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,19 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
9696
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
97-
using OSSLParamPointer = DeleteFnPtr<OSSL_PARAM, OSSL_PARAM_free>;
97+
structOSSLParamDeleter {
98+
voidoperator()(OSSL_PARAM* params) const {
99+
if (params == nullptr) return;
100+
for (OSSL_PARAM* param = params; param->key != nullptr; param++) {
101+
if (param->data != nullptr && param->data_type != OSSL_PARAM_UTF8_PTR &&
102+
 param->data_type != OSSL_PARAM_OCTET_PTR) {
103+
OPENSSL_cleanse(param->data, param->data_size);
104+
 }
105+
 }
106+
OSSL_PARAM_free(params);
107+
 }
108+
};
109+
using OSSLParamPointer = std::unique_ptr<OSSL_PARAM, OSSLParamDeleter>;
98110
structOpenSSLBufferDeleter {
99111
voidoperator()(unsignedchar* pointer) const { OPENSSL_free(pointer); }
100112
};
@@ -106,9 +118,8 @@ static constexpr int kX509NameFlagsRFC2253WithinUtf8JSON =
106118
XN_FLAG_RFC2253 & ~ASN1_STRFLGS_ESC_MSB & ~ASN1_STRFLGS_ESC_CTRL;
107119

108120
#if NCRYPTO_USE_OPENSSL3_PROVIDER
109-
boolGetPKeyBnParam(constEVP_PKEY* pkey,
110-
constchar* name,
111-
 DeleteFnPtr<BIGNUM, BN_free>* out) {
121+
template <typename Pointer>
122+
boolGetPKeyBnParam(constEVP_PKEY* pkey, constchar* name, Pointer* out) {
112123
BIGNUM* bn = nullptr;
113124
if (pkey == nullptr) returnfalse;
114125
if (EVP_PKEY_get_bn_param(pkey, name, &bn) == 1) {
@@ -135,9 +146,10 @@ bool GetPKeyBnParam(const EVP_PKEY* pkey,
135146
returntrue;
136147
}
137148

149+
template <typename Pointer>
138150
boolGetOptionalPKeyBnParam(constEVP_PKEY* pkey,
139151
constchar* name,
140-
DeleteFnPtr<BIGNUM, BN_free>* out) {
152+
Pointer* out) {
141153
BIGNUM* bn = nullptr;
142154
if (pkey == nullptr) {
143155
 out->reset();
@@ -273,9 +285,11 @@ bool GetDhParams(const EVP_PKEY* pkey,
273285

274286
boolGetDhKeys(constEVP_PKEY* pkey,
275287
 DeleteFnPtr<BIGNUM, BN_free>* pub,
276-
 DeleteFnPtr<BIGNUM, BN_free>* priv) {
277-
returnGetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub) &&
278-
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv);
288+
 DeleteFnPtr<BIGNUM, BN_clear_free>* priv) {
289+
return (pub == nullptr ||
290+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub)) &&
291+
 (priv == nullptr ||
292+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv));
279293
}
280294
#endif
281295

@@ -2290,8 +2304,7 @@ DataPointer DHPointer::getPublicKey() const {
22902304
if (!dh_) return {};
22912305

22922306
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2293-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2294-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2307+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) return {};
22952308
returnBignumPointer::Encode(pub_key.get());
22962309
#else
22972310
constBIGNUM* pub_key;
@@ -2306,9 +2319,8 @@ DataPointer DHPointer::getPrivateKey() const {
23062319
if (pvt_key_) return pvt_key_.encode();
23072320
if (!dh_) return {};
23082321

2309-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2310-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2311-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2322+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2323+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) return {};
23122324
returnBignumPointer::Encode(pvt_key.get());
23132325
#else
23142326
constBIGNUM* pvt_key;
@@ -2323,9 +2335,8 @@ bool DHPointer::hasPrivateKey() const {
23232335
if (pvt_key_) returntrue;
23242336
if (!dh_) returnfalse;
23252337

2326-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2327-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2328-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) returnfalse;
2338+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2339+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) returnfalse;
23292340
return pvt_key != nullptr;
23302341
#else
23312342
constBIGNUM* pvt_key = nullptr;
@@ -2361,7 +2372,7 @@ DataPointer DHPointer::generateKeys() {
23612372
 DeleteFnPtr<BIGNUM, BN_free> p;
23622373
 DeleteFnPtr<BIGNUM, BN_free> g;
23632374
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2364-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2375+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
23652376
if (!GetDhParams(dh_.get(), &p, &g) ||
23662377
 !GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
23672378
return {};
@@ -2496,9 +2507,8 @@ bool DHPointer::setPublicKey(BignumPointer&& key) {
24962507
returntrue;
24972508
 }
24982509

2499-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2500-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2501-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2510+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2511+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) {
25022512
returnfalse;
25032513
 }
25042514
 EVPKeyPointer pkey;
@@ -2535,8 +2545,7 @@ bool DHPointer::setPrivateKey(BignumPointer&& key) {
25352545
 }
25362546

25372547
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2538-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2539-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2548+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) {
25402549
returnfalse;
25412550
 }
25422551
 EVPKeyPointer pkey;
@@ -3537,12 +3546,13 @@ bool WriteEncryptedTraditionalPEM(BIO* bio,
35373546
size_t der_len = 0;
35383547
 OSSLEncoderCtxPointer ctx(OSSL_ENCODER_CTX_new_for_pkey(
35393548
 pkey, OSSL_KEYMGMT_SELECT_KEYPAIR, "DER", "pkcs1", nullptr));
3540-
if (!ctx || OSSL_ENCODER_to_data(ctx.get(), &der, &der_len) != 1) {
3541-
returnfalse;
3542-
 }
3549+
if (!ctx) returnfalse;
3550+
3551+
constint result = OSSL_ENCODER_to_data(ctx.get(), &der, &der_len);
3552+
 DataPointer der_storage(der, der_len);
3553+
if (result != 1) returnfalse;
35433554

3544-
 OpenSSLBufferPointer der_storage(der);
3545-
 DERView der_view{der_storage.get(), der_len};
3555+
 DERView der_view{der_storage.get<constunsignedchar>(), der_len};
35463556
returnPEM_ASN1_write_bio(
35473557
 WriteDERView,
35483558
PEM_STRING_RSA,
@@ -4977,7 +4987,7 @@ bool ECKeyPointer::generate() {
49774987
if (EVP_PKEY_keygen(ctx.get(), &raw) != 1) returnfalse;
49784988
 EVPKeyPointer pkey(raw);
49794989

4980-
 DeleteFnPtr<BIGNUM, BN_free> priv;
4990+
 DeleteFnPtr<BIGNUM, BN_clear_free> priv;
49814991
if (!GetPKeyBnParam(pkey.get(), OSSL_PKEY_PARAM_PRIV_KEY, &priv)) {
49824992
returnfalse;
49834993
 }
‎deps/ncrypto/ncrypto.h‎
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -641,12 +641,12 @@ class Rsa final {
641641
bool rsa_ = false;
642642
 DeleteFnPtr<BIGNUM, BN_free> n_;
643643
 DeleteFnPtr<BIGNUM, BN_free> e_;
644-
 DeleteFnPtr<BIGNUM, BN_free> d_;
645-
 DeleteFnPtr<BIGNUM, BN_free> p_;
646-
 DeleteFnPtr<BIGNUM, BN_free> q_;
647-
 DeleteFnPtr<BIGNUM, BN_free> dp_;
648-
 DeleteFnPtr<BIGNUM, BN_free> dq_;
649-
 DeleteFnPtr<BIGNUM, BN_free> qi_;
644+
 DeleteFnPtr<BIGNUM, BN_clear_free> d_;
645+
 DeleteFnPtr<BIGNUM, BN_clear_free> p_;
646+
 DeleteFnPtr<BIGNUM, BN_clear_free> q_;
647+
 DeleteFnPtr<BIGNUM, BN_clear_free> dp_;
648+
 DeleteFnPtr<BIGNUM, BN_clear_free> dq_;
649+
 DeleteFnPtr<BIGNUM, BN_clear_free> qi_;
650650
 std::optional<PssParams> pss_params_;
651651
#else
652652
OSSL3_CONSTRSA* rsa_;
@@ -1634,7 +1634,7 @@ class ECKeyPointer final {
16341634
#if NCRYPTO_USE_OPENSSL3_PROVIDER
16351635
 DeleteFnPtr<EC_GROUP, EC_GROUP_free> group_;
16361636
 DeleteFnPtr<EC_POINT, EC_POINT_free> pub_;
1637-
 DeleteFnPtr<BIGNUM, BN_free> priv_;
1637+
 DeleteFnPtr<BIGNUM, BN_clear_free> priv_;
16381638
#else
16391639
 DeleteFnPtr<EC_KEY, EC_KEY_free> key_;
16401640
#endif
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 49f2ae2
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: cleanse provider private key copies
Clear provider-exported RSA, EC, and DH private BIGNUMs before freeing
them. Also cleanse OSSL_PARAM builder copies and the plaintext DER
intermediate used for encrypted traditional PEM output.
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 a5d4ac8 commit 49f2ae2
2 files changed
Lines changed: 45 additions & 35 deletions
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,19 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
9696
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
97-
using OSSLParamPointer = DeleteFnPtr<OSSL_PARAM, OSSL_PARAM_free>;
97+
structOSSLParamDeleter {
98+
voidoperator()(OSSL_PARAM* params) const {
99+
if (params == nullptr) return;
100+
for (OSSL_PARAM* param = params; param->key != nullptr; param++) {
101+
if (param->data != nullptr && param->data_type != OSSL_PARAM_UTF8_PTR &&
102+
 param->data_type != OSSL_PARAM_OCTET_PTR) {
103+
OPENSSL_cleanse(param->data, param->data_size);
104+
 }
105+
 }
106+
OSSL_PARAM_free(params);
107+
 }
108+
};
109+
using OSSLParamPointer = std::unique_ptr<OSSL_PARAM, OSSLParamDeleter>;
98110
structOpenSSLBufferDeleter {
99111
voidoperator()(unsignedchar* pointer) const { OPENSSL_free(pointer); }
100112
};
@@ -106,9 +118,8 @@ static constexpr int kX509NameFlagsRFC2253WithinUtf8JSON =
106118
XN_FLAG_RFC2253 & ~ASN1_STRFLGS_ESC_MSB & ~ASN1_STRFLGS_ESC_CTRL;
107119

108120
#if NCRYPTO_USE_OPENSSL3_PROVIDER
109-
boolGetPKeyBnParam(constEVP_PKEY* pkey,
110-
constchar* name,
111-
 DeleteFnPtr<BIGNUM, BN_free>* out) {
121+
template <typename Pointer>
122+
boolGetPKeyBnParam(constEVP_PKEY* pkey, constchar* name, Pointer* out) {
112123
BIGNUM* bn = nullptr;
113124
if (pkey == nullptr) returnfalse;
114125
if (EVP_PKEY_get_bn_param(pkey, name, &bn) == 1) {
@@ -135,9 +146,10 @@ bool GetPKeyBnParam(const EVP_PKEY* pkey,
135146
returntrue;
136147
}
137148

149+
template <typename Pointer>
138150
boolGetOptionalPKeyBnParam(constEVP_PKEY* pkey,
139151
constchar* name,
140-
DeleteFnPtr<BIGNUM, BN_free>* out) {
152+
Pointer* out) {
141153
BIGNUM* bn = nullptr;
142154
if (pkey == nullptr) {
143155
 out->reset();
@@ -273,9 +285,11 @@ bool GetDhParams(const EVP_PKEY* pkey,
273285

274286
boolGetDhKeys(constEVP_PKEY* pkey,
275287
 DeleteFnPtr<BIGNUM, BN_free>* pub,
276-
 DeleteFnPtr<BIGNUM, BN_free>* priv) {
277-
returnGetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub) &&
278-
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv);
288+
 DeleteFnPtr<BIGNUM, BN_clear_free>* priv) {
289+
return (pub == nullptr ||
290+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub)) &&
291+
 (priv == nullptr ||
292+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv));
279293
}
280294
#endif
281295

@@ -2290,8 +2304,7 @@ DataPointer DHPointer::getPublicKey() const {
22902304
if (!dh_) return {};
22912305

22922306
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2293-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2294-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2307+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) return {};
22952308
returnBignumPointer::Encode(pub_key.get());
22962309
#else
22972310
constBIGNUM* pub_key;
@@ -2306,9 +2319,8 @@ DataPointer DHPointer::getPrivateKey() const {
23062319
if (pvt_key_) return pvt_key_.encode();
23072320
if (!dh_) return {};
23082321

2309-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2310-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2311-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2322+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2323+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) return {};
23122324
returnBignumPointer::Encode(pvt_key.get());
23132325
#else
23142326
constBIGNUM* pvt_key;
@@ -2323,9 +2335,8 @@ bool DHPointer::hasPrivateKey() const {
23232335
if (pvt_key_) returntrue;
23242336
if (!dh_) returnfalse;
23252337

2326-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2327-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2328-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) returnfalse;
2338+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2339+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) returnfalse;
23292340
return pvt_key != nullptr;
23302341
#else
23312342
constBIGNUM* pvt_key = nullptr;
@@ -2361,7 +2372,7 @@ DataPointer DHPointer::generateKeys() {
23612372
 DeleteFnPtr<BIGNUM, BN_free> p;
23622373
 DeleteFnPtr<BIGNUM, BN_free> g;
23632374
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2364-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2375+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
23652376
if (!GetDhParams(dh_.get(), &p, &g) ||
23662377
 !GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
23672378
return {};
@@ -2496,9 +2507,8 @@ bool DHPointer::setPublicKey(BignumPointer&& key) {
24962507
returntrue;
24972508
 }
24982509

2499-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2500-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2501-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2510+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2511+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) {
25022512
returnfalse;
25032513
 }
25042514
 EVPKeyPointer pkey;
@@ -2535,8 +2545,7 @@ bool DHPointer::setPrivateKey(BignumPointer&& key) {
25352545
 }
25362546

25372547
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2538-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2539-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2548+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) {
25402549
returnfalse;
25412550
 }
25422551
 EVPKeyPointer pkey;
@@ -3537,12 +3546,13 @@ bool WriteEncryptedTraditionalPEM(BIO* bio,
35373546
size_t der_len = 0;
35383547
 OSSLEncoderCtxPointer ctx(OSSL_ENCODER_CTX_new_for_pkey(
35393548
 pkey, OSSL_KEYMGMT_SELECT_KEYPAIR, "DER", "pkcs1", nullptr));
3540-
if (!ctx || OSSL_ENCODER_to_data(ctx.get(), &der, &der_len) != 1) {
3541-
returnfalse;
3542-
 }
3549+
if (!ctx) returnfalse;
3550+
3551+
constint result = OSSL_ENCODER_to_data(ctx.get(), &der, &der_len);
3552+
 DataPointer der_storage(der, der_len);
3553+
if (result != 1) returnfalse;
35433554

3544-
 OpenSSLBufferPointer der_storage(der);
3545-
 DERView der_view{der_storage.get(), der_len};
3555+
 DERView der_view{der_storage.get<constunsignedchar>(), der_len};
35463556
returnPEM_ASN1_write_bio(
35473557
 WriteDERView,
35483558
PEM_STRING_RSA,
@@ -4977,7 +4987,7 @@ bool ECKeyPointer::generate() {
49774987
if (EVP_PKEY_keygen(ctx.get(), &raw) != 1) returnfalse;
49784988
 EVPKeyPointer pkey(raw);
49794989

4980-
 DeleteFnPtr<BIGNUM, BN_free> priv;
4990+
 DeleteFnPtr<BIGNUM, BN_clear_free> priv;
49814991
if (!GetPKeyBnParam(pkey.get(), OSSL_PKEY_PARAM_PRIV_KEY, &priv)) {
49824992
returnfalse;
49834993
 }
‎deps/ncrypto/ncrypto.h‎
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -641,12 +641,12 @@ class Rsa final {
641641
bool rsa_ = false;
642642
 DeleteFnPtr<BIGNUM, BN_free> n_;
643643
 DeleteFnPtr<BIGNUM, BN_free> e_;
644-
 DeleteFnPtr<BIGNUM, BN_free> d_;
645-
 DeleteFnPtr<BIGNUM, BN_free> p_;
646-
 DeleteFnPtr<BIGNUM, BN_free> q_;
647-
 DeleteFnPtr<BIGNUM, BN_free> dp_;
648-
 DeleteFnPtr<BIGNUM, BN_free> dq_;
649-
 DeleteFnPtr<BIGNUM, BN_free> qi_;
644+
 DeleteFnPtr<BIGNUM, BN_clear_free> d_;
645+
 DeleteFnPtr<BIGNUM, BN_clear_free> p_;
646+
 DeleteFnPtr<BIGNUM, BN_clear_free> q_;
647+
 DeleteFnPtr<BIGNUM, BN_clear_free> dp_;
648+
 DeleteFnPtr<BIGNUM, BN_clear_free> dq_;
649+
 DeleteFnPtr<BIGNUM, BN_clear_free> qi_;
650650
 std::optional<PssParams> pss_params_;
651651
#else
652652
OSSL3_CONSTRSA* rsa_;
@@ -1634,7 +1634,7 @@ class ECKeyPointer final {
16341634
#if NCRYPTO_USE_OPENSSL3_PROVIDER
16351635
 DeleteFnPtr<EC_GROUP, EC_GROUP_free> group_;
16361636
 DeleteFnPtr<EC_POINT, EC_POINT_free> pub_;
1637-
 DeleteFnPtr<BIGNUM, BN_free> priv_;
1637+
 DeleteFnPtr<BIGNUM, BN_clear_free> priv_;
16381638
#else
16391639
 DeleteFnPtr<EC_KEY, EC_KEY_free> key_;
16401640
#endif
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 49f2ae2
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: cleanse provider private key copies
Clear provider-exported RSA, EC, and DH private BIGNUMs before freeing
them. Also cleanse OSSL_PARAM builder copies and the plaintext DER
intermediate used for encrypted traditional PEM output.
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 a5d4ac8 commit 49f2ae2
2 files changed
Lines changed: 45 additions & 35 deletions
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,19 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
9696
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
97-
using OSSLParamPointer = DeleteFnPtr<OSSL_PARAM, OSSL_PARAM_free>;
97+
structOSSLParamDeleter {
98+
voidoperator()(OSSL_PARAM* params) const {
99+
if (params == nullptr) return;
100+
for (OSSL_PARAM* param = params; param->key != nullptr; param++) {
101+
if (param->data != nullptr && param->data_type != OSSL_PARAM_UTF8_PTR &&
102+
 param->data_type != OSSL_PARAM_OCTET_PTR) {
103+
OPENSSL_cleanse(param->data, param->data_size);
104+
 }
105+
 }
106+
OSSL_PARAM_free(params);
107+
 }
108+
};
109+
using OSSLParamPointer = std::unique_ptr<OSSL_PARAM, OSSLParamDeleter>;
98110
structOpenSSLBufferDeleter {
99111
voidoperator()(unsignedchar* pointer) const { OPENSSL_free(pointer); }
100112
};
@@ -106,9 +118,8 @@ static constexpr int kX509NameFlagsRFC2253WithinUtf8JSON =
106118
XN_FLAG_RFC2253 & ~ASN1_STRFLGS_ESC_MSB & ~ASN1_STRFLGS_ESC_CTRL;
107119

108120
#if NCRYPTO_USE_OPENSSL3_PROVIDER
109-
boolGetPKeyBnParam(constEVP_PKEY* pkey,
110-
constchar* name,
111-
 DeleteFnPtr<BIGNUM, BN_free>* out) {
121+
template <typename Pointer>
122+
boolGetPKeyBnParam(constEVP_PKEY* pkey, constchar* name, Pointer* out) {
112123
BIGNUM* bn = nullptr;
113124
if (pkey == nullptr) returnfalse;
114125
if (EVP_PKEY_get_bn_param(pkey, name, &bn) == 1) {
@@ -135,9 +146,10 @@ bool GetPKeyBnParam(const EVP_PKEY* pkey,
135146
returntrue;
136147
}
137148

149+
template <typename Pointer>
138150
boolGetOptionalPKeyBnParam(constEVP_PKEY* pkey,
139151
constchar* name,
140-
DeleteFnPtr<BIGNUM, BN_free>* out) {
152+
Pointer* out) {
141153
BIGNUM* bn = nullptr;
142154
if (pkey == nullptr) {
143155
 out->reset();
@@ -273,9 +285,11 @@ bool GetDhParams(const EVP_PKEY* pkey,
273285

274286
boolGetDhKeys(constEVP_PKEY* pkey,
275287
 DeleteFnPtr<BIGNUM, BN_free>* pub,
276-
 DeleteFnPtr<BIGNUM, BN_free>* priv) {
277-
returnGetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub) &&
278-
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv);
288+
 DeleteFnPtr<BIGNUM, BN_clear_free>* priv) {
289+
return (pub == nullptr ||
290+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub)) &&
291+
 (priv == nullptr ||
292+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv));
279293
}
280294
#endif
281295

@@ -2290,8 +2304,7 @@ DataPointer DHPointer::getPublicKey() const {
22902304
if (!dh_) return {};
22912305

22922306
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2293-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2294-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2307+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) return {};
22952308
returnBignumPointer::Encode(pub_key.get());
22962309
#else
22972310
constBIGNUM* pub_key;
@@ -2306,9 +2319,8 @@ DataPointer DHPointer::getPrivateKey() const {
23062319
if (pvt_key_) return pvt_key_.encode();
23072320
if (!dh_) return {};
23082321

2309-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2310-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2311-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2322+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2323+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) return {};
23122324
returnBignumPointer::Encode(pvt_key.get());
23132325
#else
23142326
constBIGNUM* pvt_key;
@@ -2323,9 +2335,8 @@ bool DHPointer::hasPrivateKey() const {
23232335
if (pvt_key_) returntrue;
23242336
if (!dh_) returnfalse;
23252337

2326-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2327-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2328-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) returnfalse;
2338+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2339+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) returnfalse;
23292340
return pvt_key != nullptr;
23302341
#else
23312342
constBIGNUM* pvt_key = nullptr;
@@ -2361,7 +2372,7 @@ DataPointer DHPointer::generateKeys() {
23612372
 DeleteFnPtr<BIGNUM, BN_free> p;
23622373
 DeleteFnPtr<BIGNUM, BN_free> g;
23632374
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2364-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2375+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
23652376
if (!GetDhParams(dh_.get(), &p, &g) ||
23662377
 !GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
23672378
return {};
@@ -2496,9 +2507,8 @@ bool DHPointer::setPublicKey(BignumPointer&& key) {
24962507
returntrue;
24972508
 }
24982509

2499-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2500-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2501-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2510+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2511+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) {
25022512
returnfalse;
25032513
 }
25042514
 EVPKeyPointer pkey;
@@ -2535,8 +2545,7 @@ bool DHPointer::setPrivateKey(BignumPointer&& key) {
25352545
 }
25362546

25372547
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2538-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2539-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2548+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) {
25402549
returnfalse;
25412550
 }
25422551
 EVPKeyPointer pkey;
@@ -3537,12 +3546,13 @@ bool WriteEncryptedTraditionalPEM(BIO* bio,
35373546
size_t der_len = 0;
35383547
 OSSLEncoderCtxPointer ctx(OSSL_ENCODER_CTX_new_for_pkey(
35393548
 pkey, OSSL_KEYMGMT_SELECT_KEYPAIR, "DER", "pkcs1", nullptr));
3540-
if (!ctx || OSSL_ENCODER_to_data(ctx.get(), &der, &der_len) != 1) {
3541-
returnfalse;
3542-
 }
3549+
if (!ctx) returnfalse;
3550+
3551+
constint result = OSSL_ENCODER_to_data(ctx.get(), &der, &der_len);
3552+
 DataPointer der_storage(der, der_len);
3553+
if (result != 1) returnfalse;
35433554

3544-
 OpenSSLBufferPointer der_storage(der);
3545-
 DERView der_view{der_storage.get(), der_len};
3555+
 DERView der_view{der_storage.get<constunsignedchar>(), der_len};
35463556
returnPEM_ASN1_write_bio(
35473557
 WriteDERView,
35483558
PEM_STRING_RSA,
@@ -4977,7 +4987,7 @@ bool ECKeyPointer::generate() {
49774987
if (EVP_PKEY_keygen(ctx.get(), &raw) != 1) returnfalse;
49784988
 EVPKeyPointer pkey(raw);
49794989

4980-
 DeleteFnPtr<BIGNUM, BN_free> priv;
4990+
 DeleteFnPtr<BIGNUM, BN_clear_free> priv;
49814991
if (!GetPKeyBnParam(pkey.get(), OSSL_PKEY_PARAM_PRIV_KEY, &priv)) {
49824992
returnfalse;
49834993
 }
‎deps/ncrypto/ncrypto.h‎
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -641,12 +641,12 @@ class Rsa final {
641641
bool rsa_ = false;
642642
 DeleteFnPtr<BIGNUM, BN_free> n_;
643643
 DeleteFnPtr<BIGNUM, BN_free> e_;
644-
 DeleteFnPtr<BIGNUM, BN_free> d_;
645-
 DeleteFnPtr<BIGNUM, BN_free> p_;
646-
 DeleteFnPtr<BIGNUM, BN_free> q_;
647-
 DeleteFnPtr<BIGNUM, BN_free> dp_;
648-
 DeleteFnPtr<BIGNUM, BN_free> dq_;
649-
 DeleteFnPtr<BIGNUM, BN_free> qi_;
644+
 DeleteFnPtr<BIGNUM, BN_clear_free> d_;
645+
 DeleteFnPtr<BIGNUM, BN_clear_free> p_;
646+
 DeleteFnPtr<BIGNUM, BN_clear_free> q_;
647+
 DeleteFnPtr<BIGNUM, BN_clear_free> dp_;
648+
 DeleteFnPtr<BIGNUM, BN_clear_free> dq_;
649+
 DeleteFnPtr<BIGNUM, BN_clear_free> qi_;
650650
 std::optional<PssParams> pss_params_;
651651
#else
652652
OSSL3_CONSTRSA* rsa_;
@@ -1634,7 +1634,7 @@ class ECKeyPointer final {
16341634
#if NCRYPTO_USE_OPENSSL3_PROVIDER
16351635
 DeleteFnPtr<EC_GROUP, EC_GROUP_free> group_;
16361636
 DeleteFnPtr<EC_POINT, EC_POINT_free> pub_;
1637-
 DeleteFnPtr<BIGNUM, BN_free> priv_;
1637+
 DeleteFnPtr<BIGNUM, BN_clear_free> priv_;
16381638
#else
16391639
 DeleteFnPtr<EC_KEY, EC_KEY_free> key_;
16401640
#endif
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 49f2ae2
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: cleanse provider private key copies
Clear provider-exported RSA, EC, and DH private BIGNUMs before freeing
them. Also cleanse OSSL_PARAM builder copies and the plaintext DER
intermediate used for encrypted traditional PEM output.
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 a5d4ac8 commit 49f2ae2
2 files changed
Lines changed: 45 additions & 35 deletions
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,19 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
9696
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
97-
using OSSLParamPointer = DeleteFnPtr<OSSL_PARAM, OSSL_PARAM_free>;
97+
structOSSLParamDeleter {
98+
voidoperator()(OSSL_PARAM* params) const {
99+
if (params == nullptr) return;
100+
for (OSSL_PARAM* param = params; param->key != nullptr; param++) {
101+
if (param->data != nullptr && param->data_type != OSSL_PARAM_UTF8_PTR &&
102+
 param->data_type != OSSL_PARAM_OCTET_PTR) {
103+
OPENSSL_cleanse(param->data, param->data_size);
104+
 }
105+
 }
106+
OSSL_PARAM_free(params);
107+
 }
108+
};
109+
using OSSLParamPointer = std::unique_ptr<OSSL_PARAM, OSSLParamDeleter>;
98110
structOpenSSLBufferDeleter {
99111
voidoperator()(unsignedchar* pointer) const { OPENSSL_free(pointer); }
100112
};
@@ -106,9 +118,8 @@ static constexpr int kX509NameFlagsRFC2253WithinUtf8JSON =
106118
XN_FLAG_RFC2253 & ~ASN1_STRFLGS_ESC_MSB & ~ASN1_STRFLGS_ESC_CTRL;
107119

108120
#if NCRYPTO_USE_OPENSSL3_PROVIDER
109-
boolGetPKeyBnParam(constEVP_PKEY* pkey,
110-
constchar* name,
111-
 DeleteFnPtr<BIGNUM, BN_free>* out) {
121+
template <typename Pointer>
122+
boolGetPKeyBnParam(constEVP_PKEY* pkey, constchar* name, Pointer* out) {
112123
BIGNUM* bn = nullptr;
113124
if (pkey == nullptr) returnfalse;
114125
if (EVP_PKEY_get_bn_param(pkey, name, &bn) == 1) {
@@ -135,9 +146,10 @@ bool GetPKeyBnParam(const EVP_PKEY* pkey,
135146
returntrue;
136147
}
137148

149+
template <typename Pointer>
138150
boolGetOptionalPKeyBnParam(constEVP_PKEY* pkey,
139151
constchar* name,
140-
DeleteFnPtr<BIGNUM, BN_free>* out) {
152+
Pointer* out) {
141153
BIGNUM* bn = nullptr;
142154
if (pkey == nullptr) {
143155
 out->reset();
@@ -273,9 +285,11 @@ bool GetDhParams(const EVP_PKEY* pkey,
273285

274286
boolGetDhKeys(constEVP_PKEY* pkey,
275287
 DeleteFnPtr<BIGNUM, BN_free>* pub,
276-
 DeleteFnPtr<BIGNUM, BN_free>* priv) {
277-
returnGetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub) &&
278-
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv);
288+
 DeleteFnPtr<BIGNUM, BN_clear_free>* priv) {
289+
return (pub == nullptr ||
290+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub)) &&
291+
 (priv == nullptr ||
292+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv));
279293
}
280294
#endif
281295

@@ -2290,8 +2304,7 @@ DataPointer DHPointer::getPublicKey() const {
22902304
if (!dh_) return {};
22912305

22922306
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2293-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2294-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2307+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) return {};
22952308
returnBignumPointer::Encode(pub_key.get());
22962309
#else
22972310
constBIGNUM* pub_key;
@@ -2306,9 +2319,8 @@ DataPointer DHPointer::getPrivateKey() const {
23062319
if (pvt_key_) return pvt_key_.encode();
23072320
if (!dh_) return {};
23082321

2309-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2310-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2311-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2322+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2323+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) return {};
23122324
returnBignumPointer::Encode(pvt_key.get());
23132325
#else
23142326
constBIGNUM* pvt_key;
@@ -2323,9 +2335,8 @@ bool DHPointer::hasPrivateKey() const {
23232335
if (pvt_key_) returntrue;
23242336
if (!dh_) returnfalse;
23252337

2326-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2327-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2328-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) returnfalse;
2338+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2339+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) returnfalse;
23292340
return pvt_key != nullptr;
23302341
#else
23312342
constBIGNUM* pvt_key = nullptr;
@@ -2361,7 +2372,7 @@ DataPointer DHPointer::generateKeys() {
23612372
 DeleteFnPtr<BIGNUM, BN_free> p;
23622373
 DeleteFnPtr<BIGNUM, BN_free> g;
23632374
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2364-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2375+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
23652376
if (!GetDhParams(dh_.get(), &p, &g) ||
23662377
 !GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
23672378
return {};
@@ -2496,9 +2507,8 @@ bool DHPointer::setPublicKey(BignumPointer&& key) {
24962507
returntrue;
24972508
 }
24982509

2499-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2500-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2501-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2510+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2511+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) {
25022512
returnfalse;
25032513
 }
25042514
 EVPKeyPointer pkey;
@@ -2535,8 +2545,7 @@ bool DHPointer::setPrivateKey(BignumPointer&& key) {
25352545
 }
25362546

25372547
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2538-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2539-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2548+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) {
25402549
returnfalse;
25412550
 }
25422551
 EVPKeyPointer pkey;
@@ -3537,12 +3546,13 @@ bool WriteEncryptedTraditionalPEM(BIO* bio,
35373546
size_t der_len = 0;
35383547
 OSSLEncoderCtxPointer ctx(OSSL_ENCODER_CTX_new_for_pkey(
35393548
 pkey, OSSL_KEYMGMT_SELECT_KEYPAIR, "DER", "pkcs1", nullptr));
3540-
if (!ctx || OSSL_ENCODER_to_data(ctx.get(), &der, &der_len) != 1) {
3541-
returnfalse;
3542-
 }
3549+
if (!ctx) returnfalse;
3550+
3551+
constint result = OSSL_ENCODER_to_data(ctx.get(), &der, &der_len);
3552+
 DataPointer der_storage(der, der_len);
3553+
if (result != 1) returnfalse;
35433554

3544-
 OpenSSLBufferPointer der_storage(der);
3545-
 DERView der_view{der_storage.get(), der_len};
3555+
 DERView der_view{der_storage.get<constunsignedchar>(), der_len};
35463556
returnPEM_ASN1_write_bio(
35473557
 WriteDERView,
35483558
PEM_STRING_RSA,
@@ -4977,7 +4987,7 @@ bool ECKeyPointer::generate() {
49774987
if (EVP_PKEY_keygen(ctx.get(), &raw) != 1) returnfalse;
49784988
 EVPKeyPointer pkey(raw);
49794989

4980-
 DeleteFnPtr<BIGNUM, BN_free> priv;
4990+
 DeleteFnPtr<BIGNUM, BN_clear_free> priv;
49814991
if (!GetPKeyBnParam(pkey.get(), OSSL_PKEY_PARAM_PRIV_KEY, &priv)) {
49824992
returnfalse;
49834993
 }
‎deps/ncrypto/ncrypto.h‎
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -641,12 +641,12 @@ class Rsa final {
641641
bool rsa_ = false;
642642
 DeleteFnPtr<BIGNUM, BN_free> n_;
643643
 DeleteFnPtr<BIGNUM, BN_free> e_;
644-
 DeleteFnPtr<BIGNUM, BN_free> d_;
645-
 DeleteFnPtr<BIGNUM, BN_free> p_;
646-
 DeleteFnPtr<BIGNUM, BN_free> q_;
647-
 DeleteFnPtr<BIGNUM, BN_free> dp_;
648-
 DeleteFnPtr<BIGNUM, BN_free> dq_;
649-
 DeleteFnPtr<BIGNUM, BN_free> qi_;
644+
 DeleteFnPtr<BIGNUM, BN_clear_free> d_;
645+
 DeleteFnPtr<BIGNUM, BN_clear_free> p_;
646+
 DeleteFnPtr<BIGNUM, BN_clear_free> q_;
647+
 DeleteFnPtr<BIGNUM, BN_clear_free> dp_;
648+
 DeleteFnPtr<BIGNUM, BN_clear_free> dq_;
649+
 DeleteFnPtr<BIGNUM, BN_clear_free> qi_;
650650
 std::optional<PssParams> pss_params_;
651651
#else
652652
OSSL3_CONSTRSA* rsa_;
@@ -1634,7 +1634,7 @@ class ECKeyPointer final {
16341634
#if NCRYPTO_USE_OPENSSL3_PROVIDER
16351635
 DeleteFnPtr<EC_GROUP, EC_GROUP_free> group_;
16361636
 DeleteFnPtr<EC_POINT, EC_POINT_free> pub_;
1637-
 DeleteFnPtr<BIGNUM, BN_free> priv_;
1637+
 DeleteFnPtr<BIGNUM, BN_clear_free> priv_;
16381638
#else
16391639
 DeleteFnPtr<EC_KEY, EC_KEY_free> key_;
16401640
#endif
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 49f2ae2
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: cleanse provider private key copies
Clear provider-exported RSA, EC, and DH private BIGNUMs before freeing
them. Also cleanse OSSL_PARAM builder copies and the plaintext DER
intermediate used for encrypted traditional PEM output.
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 a5d4ac8 commit 49f2ae2
2 files changed
Lines changed: 45 additions & 35 deletions
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,19 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
9696
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
97-
using OSSLParamPointer = DeleteFnPtr<OSSL_PARAM, OSSL_PARAM_free>;
97+
structOSSLParamDeleter {
98+
voidoperator()(OSSL_PARAM* params) const {
99+
if (params == nullptr) return;
100+
for (OSSL_PARAM* param = params; param->key != nullptr; param++) {
101+
if (param->data != nullptr && param->data_type != OSSL_PARAM_UTF8_PTR &&
102+
 param->data_type != OSSL_PARAM_OCTET_PTR) {
103+
OPENSSL_cleanse(param->data, param->data_size);
104+
 }
105+
 }
106+
OSSL_PARAM_free(params);
107+
 }
108+
};
109+
using OSSLParamPointer = std::unique_ptr<OSSL_PARAM, OSSLParamDeleter>;
98110
structOpenSSLBufferDeleter {
99111
voidoperator()(unsignedchar* pointer) const { OPENSSL_free(pointer); }
100112
};
@@ -106,9 +118,8 @@ static constexpr int kX509NameFlagsRFC2253WithinUtf8JSON =
106118
XN_FLAG_RFC2253 & ~ASN1_STRFLGS_ESC_MSB & ~ASN1_STRFLGS_ESC_CTRL;
107119

108120
#if NCRYPTO_USE_OPENSSL3_PROVIDER
109-
boolGetPKeyBnParam(constEVP_PKEY* pkey,
110-
constchar* name,
111-
 DeleteFnPtr<BIGNUM, BN_free>* out) {
121+
template <typename Pointer>
122+
boolGetPKeyBnParam(constEVP_PKEY* pkey, constchar* name, Pointer* out) {
112123
BIGNUM* bn = nullptr;
113124
if (pkey == nullptr) returnfalse;
114125
if (EVP_PKEY_get_bn_param(pkey, name, &bn) == 1) {
@@ -135,9 +146,10 @@ bool GetPKeyBnParam(const EVP_PKEY* pkey,
135146
returntrue;
136147
}
137148

149+
template <typename Pointer>
138150
boolGetOptionalPKeyBnParam(constEVP_PKEY* pkey,
139151
constchar* name,
140-
DeleteFnPtr<BIGNUM, BN_free>* out) {
152+
Pointer* out) {
141153
BIGNUM* bn = nullptr;
142154
if (pkey == nullptr) {
143155
 out->reset();
@@ -273,9 +285,11 @@ bool GetDhParams(const EVP_PKEY* pkey,
273285

274286
boolGetDhKeys(constEVP_PKEY* pkey,
275287
 DeleteFnPtr<BIGNUM, BN_free>* pub,
276-
 DeleteFnPtr<BIGNUM, BN_free>* priv) {
277-
returnGetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub) &&
278-
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv);
288+
 DeleteFnPtr<BIGNUM, BN_clear_free>* priv) {
289+
return (pub == nullptr ||
290+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub)) &&
291+
 (priv == nullptr ||
292+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv));
279293
}
280294
#endif
281295

@@ -2290,8 +2304,7 @@ DataPointer DHPointer::getPublicKey() const {
22902304
if (!dh_) return {};
22912305

22922306
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2293-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2294-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2307+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) return {};
22952308
returnBignumPointer::Encode(pub_key.get());
22962309
#else
22972310
constBIGNUM* pub_key;
@@ -2306,9 +2319,8 @@ DataPointer DHPointer::getPrivateKey() const {
23062319
if (pvt_key_) return pvt_key_.encode();
23072320
if (!dh_) return {};
23082321

2309-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2310-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2311-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2322+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2323+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) return {};
23122324
returnBignumPointer::Encode(pvt_key.get());
23132325
#else
23142326
constBIGNUM* pvt_key;
@@ -2323,9 +2335,8 @@ bool DHPointer::hasPrivateKey() const {
23232335
if (pvt_key_) returntrue;
23242336
if (!dh_) returnfalse;
23252337

2326-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2327-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2328-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) returnfalse;
2338+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2339+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) returnfalse;
23292340
return pvt_key != nullptr;
23302341
#else
23312342
constBIGNUM* pvt_key = nullptr;
@@ -2361,7 +2372,7 @@ DataPointer DHPointer::generateKeys() {
23612372
 DeleteFnPtr<BIGNUM, BN_free> p;
23622373
 DeleteFnPtr<BIGNUM, BN_free> g;
23632374
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2364-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2375+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
23652376
if (!GetDhParams(dh_.get(), &p, &g) ||
23662377
 !GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
23672378
return {};
@@ -2496,9 +2507,8 @@ bool DHPointer::setPublicKey(BignumPointer&& key) {
24962507
returntrue;
24972508
 }
24982509

2499-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2500-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2501-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2510+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2511+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) {
25022512
returnfalse;
25032513
 }
25042514
 EVPKeyPointer pkey;
@@ -2535,8 +2545,7 @@ bool DHPointer::setPrivateKey(BignumPointer&& key) {
25352545
 }
25362546

25372547
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2538-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2539-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2548+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) {
25402549
returnfalse;
25412550
 }
25422551
 EVPKeyPointer pkey;
@@ -3537,12 +3546,13 @@ bool WriteEncryptedTraditionalPEM(BIO* bio,
35373546
size_t der_len = 0;
35383547
 OSSLEncoderCtxPointer ctx(OSSL_ENCODER_CTX_new_for_pkey(
35393548
 pkey, OSSL_KEYMGMT_SELECT_KEYPAIR, "DER", "pkcs1", nullptr));
3540-
if (!ctx || OSSL_ENCODER_to_data(ctx.get(), &der, &der_len) != 1) {
3541-
returnfalse;
3542-
 }
3549+
if (!ctx) returnfalse;
3550+
3551+
constint result = OSSL_ENCODER_to_data(ctx.get(), &der, &der_len);
3552+
 DataPointer der_storage(der, der_len);
3553+
if (result != 1) returnfalse;
35433554

3544-
 OpenSSLBufferPointer der_storage(der);
3545-
 DERView der_view{der_storage.get(), der_len};
3555+
 DERView der_view{der_storage.get<constunsignedchar>(), der_len};
35463556
returnPEM_ASN1_write_bio(
35473557
 WriteDERView,
35483558
PEM_STRING_RSA,
@@ -4977,7 +4987,7 @@ bool ECKeyPointer::generate() {
49774987
if (EVP_PKEY_keygen(ctx.get(), &raw) != 1) returnfalse;
49784988
 EVPKeyPointer pkey(raw);
49794989

4980-
 DeleteFnPtr<BIGNUM, BN_free> priv;
4990+
 DeleteFnPtr<BIGNUM, BN_clear_free> priv;
49814991
if (!GetPKeyBnParam(pkey.get(), OSSL_PKEY_PARAM_PRIV_KEY, &priv)) {
49824992
returnfalse;
49834993
 }
‎deps/ncrypto/ncrypto.h‎
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -641,12 +641,12 @@ class Rsa final {
641641
bool rsa_ = false;
642642
 DeleteFnPtr<BIGNUM, BN_free> n_;
643643
 DeleteFnPtr<BIGNUM, BN_free> e_;
644-
 DeleteFnPtr<BIGNUM, BN_free> d_;
645-
 DeleteFnPtr<BIGNUM, BN_free> p_;
646-
 DeleteFnPtr<BIGNUM, BN_free> q_;
647-
 DeleteFnPtr<BIGNUM, BN_free> dp_;
648-
 DeleteFnPtr<BIGNUM, BN_free> dq_;
649-
 DeleteFnPtr<BIGNUM, BN_free> qi_;
644+
 DeleteFnPtr<BIGNUM, BN_clear_free> d_;
645+
 DeleteFnPtr<BIGNUM, BN_clear_free> p_;
646+
 DeleteFnPtr<BIGNUM, BN_clear_free> q_;
647+
 DeleteFnPtr<BIGNUM, BN_clear_free> dp_;
648+
 DeleteFnPtr<BIGNUM, BN_clear_free> dq_;
649+
 DeleteFnPtr<BIGNUM, BN_clear_free> qi_;
650650
 std::optional<PssParams> pss_params_;
651651
#else
652652
OSSL3_CONSTRSA* rsa_;
@@ -1634,7 +1634,7 @@ class ECKeyPointer final {
16341634
#if NCRYPTO_USE_OPENSSL3_PROVIDER
16351635
 DeleteFnPtr<EC_GROUP, EC_GROUP_free> group_;
16361636
 DeleteFnPtr<EC_POINT, EC_POINT_free> pub_;
1637-
 DeleteFnPtr<BIGNUM, BN_free> priv_;
1637+
 DeleteFnPtr<BIGNUM, BN_clear_free> priv_;
16381638
#else
16391639
 DeleteFnPtr<EC_KEY, EC_KEY_free> key_;
16401640
#endif
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 49f2ae2
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: cleanse provider private key copies
Clear provider-exported RSA, EC, and DH private BIGNUMs before freeing
them. Also cleanse OSSL_PARAM builder copies and the plaintext DER
intermediate used for encrypted traditional PEM output.
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 a5d4ac8 commit 49f2ae2
2 files changed
Lines changed: 45 additions & 35 deletions
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,19 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
9696
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
97-
using OSSLParamPointer = DeleteFnPtr<OSSL_PARAM, OSSL_PARAM_free>;
97+
structOSSLParamDeleter {
98+
voidoperator()(OSSL_PARAM* params) const {
99+
if (params == nullptr) return;
100+
for (OSSL_PARAM* param = params; param->key != nullptr; param++) {
101+
if (param->data != nullptr && param->data_type != OSSL_PARAM_UTF8_PTR &&
102+
 param->data_type != OSSL_PARAM_OCTET_PTR) {
103+
OPENSSL_cleanse(param->data, param->data_size);
104+
 }
105+
 }
106+
OSSL_PARAM_free(params);
107+
 }
108+
};
109+
using OSSLParamPointer = std::unique_ptr<OSSL_PARAM, OSSLParamDeleter>;
98110
structOpenSSLBufferDeleter {
99111
voidoperator()(unsignedchar* pointer) const { OPENSSL_free(pointer); }
100112
};
@@ -106,9 +118,8 @@ static constexpr int kX509NameFlagsRFC2253WithinUtf8JSON =
106118
XN_FLAG_RFC2253 & ~ASN1_STRFLGS_ESC_MSB & ~ASN1_STRFLGS_ESC_CTRL;
107119

108120
#if NCRYPTO_USE_OPENSSL3_PROVIDER
109-
boolGetPKeyBnParam(constEVP_PKEY* pkey,
110-
constchar* name,
111-
 DeleteFnPtr<BIGNUM, BN_free>* out) {
121+
template <typename Pointer>
122+
boolGetPKeyBnParam(constEVP_PKEY* pkey, constchar* name, Pointer* out) {
112123
BIGNUM* bn = nullptr;
113124
if (pkey == nullptr) returnfalse;
114125
if (EVP_PKEY_get_bn_param(pkey, name, &bn) == 1) {
@@ -135,9 +146,10 @@ bool GetPKeyBnParam(const EVP_PKEY* pkey,
135146
returntrue;
136147
}
137148

149+
template <typename Pointer>
138150
boolGetOptionalPKeyBnParam(constEVP_PKEY* pkey,
139151
constchar* name,
140-
DeleteFnPtr<BIGNUM, BN_free>* out) {
152+
Pointer* out) {
141153
BIGNUM* bn = nullptr;
142154
if (pkey == nullptr) {
143155
 out->reset();
@@ -273,9 +285,11 @@ bool GetDhParams(const EVP_PKEY* pkey,
273285

274286
boolGetDhKeys(constEVP_PKEY* pkey,
275287
 DeleteFnPtr<BIGNUM, BN_free>* pub,
276-
 DeleteFnPtr<BIGNUM, BN_free>* priv) {
277-
returnGetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub) &&
278-
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv);
288+
 DeleteFnPtr<BIGNUM, BN_clear_free>* priv) {
289+
return (pub == nullptr ||
290+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub)) &&
291+
 (priv == nullptr ||
292+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv));
279293
}
280294
#endif
281295

@@ -2290,8 +2304,7 @@ DataPointer DHPointer::getPublicKey() const {
22902304
if (!dh_) return {};
22912305

22922306
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2293-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2294-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2307+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) return {};
22952308
returnBignumPointer::Encode(pub_key.get());
22962309
#else
22972310
constBIGNUM* pub_key;
@@ -2306,9 +2319,8 @@ DataPointer DHPointer::getPrivateKey() const {
23062319
if (pvt_key_) return pvt_key_.encode();
23072320
if (!dh_) return {};
23082321

2309-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2310-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2311-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2322+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2323+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) return {};
23122324
returnBignumPointer::Encode(pvt_key.get());
23132325
#else
23142326
constBIGNUM* pvt_key;
@@ -2323,9 +2335,8 @@ bool DHPointer::hasPrivateKey() const {
23232335
if (pvt_key_) returntrue;
23242336
if (!dh_) returnfalse;
23252337

2326-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2327-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2328-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) returnfalse;
2338+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2339+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) returnfalse;
23292340
return pvt_key != nullptr;
23302341
#else
23312342
constBIGNUM* pvt_key = nullptr;
@@ -2361,7 +2372,7 @@ DataPointer DHPointer::generateKeys() {
23612372
 DeleteFnPtr<BIGNUM, BN_free> p;
23622373
 DeleteFnPtr<BIGNUM, BN_free> g;
23632374
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2364-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2375+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
23652376
if (!GetDhParams(dh_.get(), &p, &g) ||
23662377
 !GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
23672378
return {};
@@ -2496,9 +2507,8 @@ bool DHPointer::setPublicKey(BignumPointer&& key) {
24962507
returntrue;
24972508
 }
24982509

2499-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2500-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2501-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2510+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2511+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) {
25022512
returnfalse;
25032513
 }
25042514
 EVPKeyPointer pkey;
@@ -2535,8 +2545,7 @@ bool DHPointer::setPrivateKey(BignumPointer&& key) {
25352545
 }
25362546

25372547
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2538-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2539-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2548+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) {
25402549
returnfalse;
25412550
 }
25422551
 EVPKeyPointer pkey;
@@ -3537,12 +3546,13 @@ bool WriteEncryptedTraditionalPEM(BIO* bio,
35373546
size_t der_len = 0;
35383547
 OSSLEncoderCtxPointer ctx(OSSL_ENCODER_CTX_new_for_pkey(
35393548
 pkey, OSSL_KEYMGMT_SELECT_KEYPAIR, "DER", "pkcs1", nullptr));
3540-
if (!ctx || OSSL_ENCODER_to_data(ctx.get(), &der, &der_len) != 1) {
3541-
returnfalse;
3542-
 }
3549+
if (!ctx) returnfalse;
3550+
3551+
constint result = OSSL_ENCODER_to_data(ctx.get(), &der, &der_len);
3552+
 DataPointer der_storage(der, der_len);
3553+
if (result != 1) returnfalse;
35433554

3544-
 OpenSSLBufferPointer der_storage(der);
3545-
 DERView der_view{der_storage.get(), der_len};
3555+
 DERView der_view{der_storage.get<constunsignedchar>(), der_len};
35463556
returnPEM_ASN1_write_bio(
35473557
 WriteDERView,
35483558
PEM_STRING_RSA,
@@ -4977,7 +4987,7 @@ bool ECKeyPointer::generate() {
49774987
if (EVP_PKEY_keygen(ctx.get(), &raw) != 1) returnfalse;
49784988
 EVPKeyPointer pkey(raw);
49794989

4980-
 DeleteFnPtr<BIGNUM, BN_free> priv;
4990+
 DeleteFnPtr<BIGNUM, BN_clear_free> priv;
49814991
if (!GetPKeyBnParam(pkey.get(), OSSL_PKEY_PARAM_PRIV_KEY, &priv)) {
49824992
returnfalse;
49834993
 }
‎deps/ncrypto/ncrypto.h‎
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -641,12 +641,12 @@ class Rsa final {
641641
bool rsa_ = false;
642642
 DeleteFnPtr<BIGNUM, BN_free> n_;
643643
 DeleteFnPtr<BIGNUM, BN_free> e_;
644-
 DeleteFnPtr<BIGNUM, BN_free> d_;
645-
 DeleteFnPtr<BIGNUM, BN_free> p_;
646-
 DeleteFnPtr<BIGNUM, BN_free> q_;
647-
 DeleteFnPtr<BIGNUM, BN_free> dp_;
648-
 DeleteFnPtr<BIGNUM, BN_free> dq_;
649-
 DeleteFnPtr<BIGNUM, BN_free> qi_;
644+
 DeleteFnPtr<BIGNUM, BN_clear_free> d_;
645+
 DeleteFnPtr<BIGNUM, BN_clear_free> p_;
646+
 DeleteFnPtr<BIGNUM, BN_clear_free> q_;
647+
 DeleteFnPtr<BIGNUM, BN_clear_free> dp_;
648+
 DeleteFnPtr<BIGNUM, BN_clear_free> dq_;
649+
 DeleteFnPtr<BIGNUM, BN_clear_free> qi_;
650650
 std::optional<PssParams> pss_params_;
651651
#else
652652
OSSL3_CONSTRSA* rsa_;
@@ -1634,7 +1634,7 @@ class ECKeyPointer final {
16341634
#if NCRYPTO_USE_OPENSSL3_PROVIDER
16351635
 DeleteFnPtr<EC_GROUP, EC_GROUP_free> group_;
16361636
 DeleteFnPtr<EC_POINT, EC_POINT_free> pub_;
1637-
 DeleteFnPtr<BIGNUM, BN_free> priv_;
1637+
 DeleteFnPtr<BIGNUM, BN_clear_free> priv_;
16381638
#else
16391639
 DeleteFnPtr<EC_KEY, EC_KEY_free> key_;
16401640
#endif
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 49f2ae2
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: cleanse provider private key copies
Clear provider-exported RSA, EC, and DH private BIGNUMs before freeing
them. Also cleanse OSSL_PARAM builder copies and the plaintext DER
intermediate used for encrypted traditional PEM output.
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 a5d4ac8 commit 49f2ae2
2 files changed
Lines changed: 45 additions & 35 deletions
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,19 @@ const EVP_MD* GetDigestCtxMd(const EVP_MD_CTX* ctx) {
9494

9595
#if NCRYPTO_USE_OPENSSL3_PROVIDER
9696
using OSSLParamBldPointer = DeleteFnPtr<OSSL_PARAM_BLD, OSSL_PARAM_BLD_free>;
97-
using OSSLParamPointer = DeleteFnPtr<OSSL_PARAM, OSSL_PARAM_free>;
97+
structOSSLParamDeleter {
98+
voidoperator()(OSSL_PARAM* params) const {
99+
if (params == nullptr) return;
100+
for (OSSL_PARAM* param = params; param->key != nullptr; param++) {
101+
if (param->data != nullptr && param->data_type != OSSL_PARAM_UTF8_PTR &&
102+
 param->data_type != OSSL_PARAM_OCTET_PTR) {
103+
OPENSSL_cleanse(param->data, param->data_size);
104+
 }
105+
 }
106+
OSSL_PARAM_free(params);
107+
 }
108+
};
109+
using OSSLParamPointer = std::unique_ptr<OSSL_PARAM, OSSLParamDeleter>;
98110
structOpenSSLBufferDeleter {
99111
voidoperator()(unsignedchar* pointer) const { OPENSSL_free(pointer); }
100112
};
@@ -106,9 +118,8 @@ static constexpr int kX509NameFlagsRFC2253WithinUtf8JSON =
106118
XN_FLAG_RFC2253 & ~ASN1_STRFLGS_ESC_MSB & ~ASN1_STRFLGS_ESC_CTRL;
107119

108120
#if NCRYPTO_USE_OPENSSL3_PROVIDER
109-
boolGetPKeyBnParam(constEVP_PKEY* pkey,
110-
constchar* name,
111-
 DeleteFnPtr<BIGNUM, BN_free>* out) {
121+
template <typename Pointer>
122+
boolGetPKeyBnParam(constEVP_PKEY* pkey, constchar* name, Pointer* out) {
112123
BIGNUM* bn = nullptr;
113124
if (pkey == nullptr) returnfalse;
114125
if (EVP_PKEY_get_bn_param(pkey, name, &bn) == 1) {
@@ -135,9 +146,10 @@ bool GetPKeyBnParam(const EVP_PKEY* pkey,
135146
returntrue;
136147
}
137148

149+
template <typename Pointer>
138150
boolGetOptionalPKeyBnParam(constEVP_PKEY* pkey,
139151
constchar* name,
140-
DeleteFnPtr<BIGNUM, BN_free>* out) {
152+
Pointer* out) {
141153
BIGNUM* bn = nullptr;
142154
if (pkey == nullptr) {
143155
 out->reset();
@@ -273,9 +285,11 @@ bool GetDhParams(const EVP_PKEY* pkey,
273285

274286
boolGetDhKeys(constEVP_PKEY* pkey,
275287
 DeleteFnPtr<BIGNUM, BN_free>* pub,
276-
 DeleteFnPtr<BIGNUM, BN_free>* priv) {
277-
returnGetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub) &&
278-
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv);
288+
 DeleteFnPtr<BIGNUM, BN_clear_free>* priv) {
289+
return (pub == nullptr ||
290+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PUB_KEY, pub)) &&
291+
 (priv == nullptr ||
292+
GetOptionalPKeyBnParam(pkey, OSSL_PKEY_PARAM_PRIV_KEY, priv));
279293
}
280294
#endif
281295

@@ -2290,8 +2304,7 @@ DataPointer DHPointer::getPublicKey() const {
22902304
if (!dh_) return {};
22912305

22922306
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2293-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2294-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2307+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) return {};
22952308
returnBignumPointer::Encode(pub_key.get());
22962309
#else
22972310
constBIGNUM* pub_key;
@@ -2306,9 +2319,8 @@ DataPointer DHPointer::getPrivateKey() const {
23062319
if (pvt_key_) return pvt_key_.encode();
23072320
if (!dh_) return {};
23082321

2309-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2310-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2311-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) return {};
2322+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2323+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) return {};
23122324
returnBignumPointer::Encode(pvt_key.get());
23132325
#else
23142326
constBIGNUM* pvt_key;
@@ -2323,9 +2335,8 @@ bool DHPointer::hasPrivateKey() const {
23232335
if (pvt_key_) returntrue;
23242336
if (!dh_) returnfalse;
23252337

2326-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2327-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2328-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) returnfalse;
2338+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2339+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) returnfalse;
23292340
return pvt_key != nullptr;
23302341
#else
23312342
constBIGNUM* pvt_key = nullptr;
@@ -2361,7 +2372,7 @@ DataPointer DHPointer::generateKeys() {
23612372
 DeleteFnPtr<BIGNUM, BN_free> p;
23622373
 DeleteFnPtr<BIGNUM, BN_free> g;
23632374
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2364-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2375+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
23652376
if (!GetDhParams(dh_.get(), &p, &g) ||
23662377
 !GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
23672378
return {};
@@ -2496,9 +2507,8 @@ bool DHPointer::setPublicKey(BignumPointer&& key) {
24962507
returntrue;
24972508
 }
24982509

2499-
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2500-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2501-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2510+
 DeleteFnPtr<BIGNUM, BN_clear_free> pvt_key;
2511+
if (!GetDhKeys(dh_.get(), nullptr, &pvt_key)) {
25022512
returnfalse;
25032513
 }
25042514
 EVPKeyPointer pkey;
@@ -2535,8 +2545,7 @@ bool DHPointer::setPrivateKey(BignumPointer&& key) {
25352545
 }
25362546

25372547
 DeleteFnPtr<BIGNUM, BN_free> pub_key;
2538-
 DeleteFnPtr<BIGNUM, BN_free> pvt_key;
2539-
if (!GetDhKeys(dh_.get(), &pub_key, &pvt_key)) {
2548+
if (!GetDhKeys(dh_.get(), &pub_key, nullptr)) {
25402549
returnfalse;
25412550
 }
25422551
 EVPKeyPointer pkey;
@@ -3537,12 +3546,13 @@ bool WriteEncryptedTraditionalPEM(BIO* bio,
35373546
size_t der_len = 0;
35383547
 OSSLEncoderCtxPointer ctx(OSSL_ENCODER_CTX_new_for_pkey(
35393548
 pkey, OSSL_KEYMGMT_SELECT_KEYPAIR, "DER", "pkcs1", nullptr));
3540-
if (!ctx || OSSL_ENCODER_to_data(ctx.get(), &der, &der_len) != 1) {
3541-
returnfalse;
3542-
 }
3549+
if (!ctx) returnfalse;
3550+
3551+
constint result = OSSL_ENCODER_to_data(ctx.get(), &der, &der_len);
3552+
 DataPointer der_storage(der, der_len);
3553+
if (result != 1) returnfalse;
35433554

3544-
 OpenSSLBufferPointer der_storage(der);
3545-
 DERView der_view{der_storage.get(), der_len};
3555+
 DERView der_view{der_storage.get<constunsignedchar>(), der_len};
35463556
returnPEM_ASN1_write_bio(
35473557
 WriteDERView,
35483558
PEM_STRING_RSA,
@@ -4977,7 +4987,7 @@ bool ECKeyPointer::generate() {
49774987
if (EVP_PKEY_keygen(ctx.get(), &raw) != 1) returnfalse;
49784988
 EVPKeyPointer pkey(raw);
49794989

4980-
 DeleteFnPtr<BIGNUM, BN_free> priv;
4990+
 DeleteFnPtr<BIGNUM, BN_clear_free> priv;
49814991
if (!GetPKeyBnParam(pkey.get(), OSSL_PKEY_PARAM_PRIV_KEY, &priv)) {
49824992
returnfalse;
49834993
 }
‎deps/ncrypto/ncrypto.h‎
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -641,12 +641,12 @@ class Rsa final {
641641
bool rsa_ = false;
642642
 DeleteFnPtr<BIGNUM, BN_free> n_;
643643
 DeleteFnPtr<BIGNUM, BN_free> e_;
644-
 DeleteFnPtr<BIGNUM, BN_free> d_;
645-
 DeleteFnPtr<BIGNUM, BN_free> p_;
646-
 DeleteFnPtr<BIGNUM, BN_free> q_;
647-
 DeleteFnPtr<BIGNUM, BN_free> dp_;
648-
 DeleteFnPtr<BIGNUM, BN_free> dq_;
649-
 DeleteFnPtr<BIGNUM, BN_free> qi_;
644+
 DeleteFnPtr<BIGNUM, BN_clear_free> d_;
645+
 DeleteFnPtr<BIGNUM, BN_clear_free> p_;
646+
 DeleteFnPtr<BIGNUM, BN_clear_free> q_;
647+
 DeleteFnPtr<BIGNUM, BN_clear_free> dp_;
648+
 DeleteFnPtr<BIGNUM, BN_clear_free> dq_;
649+
 DeleteFnPtr<BIGNUM, BN_clear_free> qi_;
650650
 std::optional<PssParams> pss_params_;
651651
#else
652652
OSSL3_CONSTRSA* rsa_;
@@ -1634,7 +1634,7 @@ class ECKeyPointer final {
16341634
#if NCRYPTO_USE_OPENSSL3_PROVIDER
16351635
 DeleteFnPtr<EC_GROUP, EC_GROUP_free> group_;
16361636
 DeleteFnPtr<EC_POINT, EC_POINT_free> pub_;
1637-
 DeleteFnPtr<BIGNUM, BN_free> priv_;
1637+
 DeleteFnPtr<BIGNUM, BN_clear_free> priv_;
16381638
#else
16391639
 DeleteFnPtr<EC_KEY, EC_KEY_free> key_;
16401640
#endif
0 commit comments
Comments
 (0)