Commit 0e87576

Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: remove obsolete BoringSSL shims
BoringSSL implements OPENSSL_zalloc and BN_secure_new and provides compatible secure heap status stubs. Use the common code paths. Remove ClientHello helpers left unused by the early callback migration and require the fixed ML-KEM private-key import error. Signed-off-by: Filip Skokan <panva.ip@gmail.com> PR-URL: #65423 Backport-PR-URL: #65483 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 17d2b06 commit 0e87576

3 files changed

Lines changed: 2 additions & 84 deletions

File tree

‎deps/ncrypto/ncrypto.cc‎

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {
396396

397397
// ============================================================================
398398
DataPointer DataPointer::Alloc(size_t len) {
399-
#ifdef OPENSSL_IS_BORINGSSL
400-
// Boringssl does not implement OPENSSL_zalloc
401-
auto ptr = OPENSSL_malloc(len);
402-
if (ptr == nullptr) return {};
403-
memset(ptr, 0, len);
404-
returnDataPointer(ptr, len);
405-
#else
406399
returnDataPointer(OPENSSL_zalloc(len), len);
407-
#endif
408400
}
409401

410402
DataPointer DataPointer::SecureAlloc(size_t len) {
@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
427419
}
428420

429421
size_tDataPointer::GetSecureHeapUsed() {
430-
#ifndef OPENSSL_IS_BORINGSSL
431422
returnCRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
432-
#else
433-
// BoringSSL does not have the secure heap and therefore
434-
// will always return 0.
435-
return0;
436-
#endif
437423
}
438424

439425
DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
440426
size_t min) {
441-
#ifndef OPENSSL_IS_BORINGSSL
442427
switch (CRYPTO_secure_malloc_init(amount, min)) {
443428
case0:
444429
return InitSecureHeapResult::FAILED;
@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
449434
default:
450435
return InitSecureHeapResult::FAILED;
451436
}
452-
#else
453-
// BoringSSL does not actually support the secure heap
454-
return InitSecureHeapResult::FAILED;
455-
#endif
456437
}
457438

458439
DataPointer DataPointer::Copy(const Buffer<constvoid>& buffer) {
@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
580561
}
581562

582563
BignumPointer BignumPointer::NewSecure() {
583-
#ifdef OPENSSL_IS_BORINGSSL
584-
// Boringssl does not implement BN_secure_new.
585-
returnNew();
586-
#else
587564
returnBignumPointer(BN_secure_new());
588-
#endif
589565
}
590566

591567
BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
@@ -4288,59 +4264,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
42884264
return std::nullopt;
42894265
}
42904266

4291-
constchar* SSLPointer::getClientHelloAlpn() const {
4292-
if (ssl_ == nullptr) return {};
4293-
#ifndef OPENSSL_IS_BORINGSSL
4294-
constunsignedchar* buf;
4295-
size_t len;
4296-
size_t rem;
4297-
4298-
if (!SSL_client_hello_get0_ext(
4299-
get(),
4300-
TLSEXT_TYPE_application_layer_protocol_negotiation,
4301-
&buf,
4302-
&rem) ||
4303-
rem < 2) {
4304-
return {};
4305-
}
4306-
4307-
len = (buf[0] << 8) | buf[1];
4308-
if (len + 2 != rem) return {};
4309-
returnreinterpret_cast<constchar*>(buf + 3);
4310-
#else
4311-
// Boringssl doesn't have a public API for this.
4312-
return {};
4313-
#endif
4314-
}
4315-
4316-
constchar* SSLPointer::getClientHelloServerName() const {
4317-
if (ssl_ == nullptr) return {};
4318-
#ifndef OPENSSL_IS_BORINGSSL
4319-
constunsignedchar* buf;
4320-
size_t len;
4321-
size_t rem;
4322-
4323-
if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
4324-
rem <= 2) {
4325-
return {};
4326-
}
4327-
4328-
len = (*buf << 8) | *(buf + 1);
4329-
if (len + 2 != rem) return {};
4330-
rem = len;
4331-
4332-
if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
4333-
rem--;
4334-
if (rem <= 2) return {};
4335-
len = (*(buf + 3) << 8) | *(buf + 4);
4336-
if (len + 2 > rem) return {};
4337-
returnreinterpret_cast<constchar*>(buf + 5);
4338-
#else
4339-
// Boringssl doesn't have a public API for this.
4340-
return {};
4341-
#endif
4342-
}
4343-
43444267
std::optional<const std::string_view> SSLPointer::GetServerName(
43454268
constSSL* ssl) {
43464269
if (ssl == nullptr) return std::nullopt;

‎deps/ncrypto/ncrypto.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,9 +1346,6 @@ class SSLPointer final {
13461346
boolsetSession(const SSLSessionPointer& session);
13471347
boolsetSniContext(const SSLCtxPointer& ctx) const;
13481348

1349-
constchar* getClientHelloAlpn() const;
1350-
constchar* getClientHelloServerName() const;
1351-
13521349
std::optional<const std::string_view> getServerName() const;
13531350
X509View getCertificate() const;
13541351
EVPKeyPointer getPeerTempKey() const;

‎test/parallel/test-webcrypto-export-import-ml-kem.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,8 @@ async function testImportPkcs8({ name, privateUsages }, extractable) {
107107
}catch(err){
108108
if(process.features.openssl_is_boringssl){
109109
assert.strictEqual(err.name,'DataError');
110-
// It should really only be ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED
111-
// but BoringSSL is inconsistent between handling ML-KEM and ML-DSA
112-
// Fixed in https://github.com/google/boringssl/commit/94c4c7f9e0eeeff72ea1ac6abf1aed5bd2a82c0c
113-
assert.match(err.cause.code,/ERR_OSSL_EVP_UNSUPPORTED_ALGORITHM|ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED/);
110+
assert.strictEqual(err.cause.code,
111+
'ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED');
114112
common.printSkipMessage('Skipping unsupported private key format test');
115113
return;
116114
}

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 0e87576
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: remove obsolete BoringSSL shims
BoringSSL implements OPENSSL_zalloc and BN_secure_new and provides
compatible secure heap status stubs. Use the common code paths.
Remove ClientHello helpers left unused by the early callback migration
and require the fixed ML-KEM private-key import error.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #65423
Backport-PR-URL: #65483
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 17d2b06 commit 0e87576
3 files changed
Lines changed: 2 additions & 84 deletions
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {
396396

397397
// ============================================================================
398398
DataPointer DataPointer::Alloc(size_t len) {
399-
#ifdef OPENSSL_IS_BORINGSSL
400-
// Boringssl does not implement OPENSSL_zalloc
401-
auto ptr = OPENSSL_malloc(len);
402-
if (ptr == nullptr) return {};
403-
memset(ptr, 0, len);
404-
returnDataPointer(ptr, len);
405-
#else
406399
returnDataPointer(OPENSSL_zalloc(len), len);
407-
#endif
408400
}
409401

410402
DataPointer DataPointer::SecureAlloc(size_t len) {
@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
427419
}
428420

429421
size_tDataPointer::GetSecureHeapUsed() {
430-
#ifndef OPENSSL_IS_BORINGSSL
431422
returnCRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
432-
#else
433-
// BoringSSL does not have the secure heap and therefore
434-
// will always return 0.
435-
return0;
436-
#endif
437423
}
438424

439425
DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
440426
size_t min) {
441-
#ifndef OPENSSL_IS_BORINGSSL
442427
switch (CRYPTO_secure_malloc_init(amount, min)) {
443428
case0:
444429
return InitSecureHeapResult::FAILED;
@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
449434
default:
450435
return InitSecureHeapResult::FAILED;
451436
 }
452-
#else
453-
// BoringSSL does not actually support the secure heap
454-
return InitSecureHeapResult::FAILED;
455-
#endif
456437
}
457438

458439
DataPointer DataPointer::Copy(const Buffer<constvoid>& buffer) {
@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
580561
}
581562

582563
BignumPointer BignumPointer::NewSecure() {
583-
#ifdef OPENSSL_IS_BORINGSSL
584-
// Boringssl does not implement BN_secure_new.
585-
returnNew();
586-
#else
587564
returnBignumPointer(BN_secure_new());
588-
#endif
589565
}
590566

591567
BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
@@ -4288,59 +4264,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
42884264
return std::nullopt;
42894265
}
42904266

4291-
constchar* SSLPointer::getClientHelloAlpn() const {
4292-
if (ssl_ == nullptr) return {};
4293-
#ifndef OPENSSL_IS_BORINGSSL
4294-
constunsignedchar* buf;
4295-
size_t len;
4296-
size_t rem;
4297-
4298-
if (!SSL_client_hello_get0_ext(
4299-
get(),
4300-
 TLSEXT_TYPE_application_layer_protocol_negotiation,
4301-
 &buf,
4302-
 &rem) ||
4303-
 rem < 2) {
4304-
return {};
4305-
 }
4306-
4307-
 len = (buf[0] << 8) | buf[1];
4308-
if (len + 2 != rem) return {};
4309-
returnreinterpret_cast<constchar*>(buf + 3);
4310-
#else
4311-
// Boringssl doesn't have a public API for this.
4312-
return {};
4313-
#endif
4314-
}
4315-
4316-
constchar* SSLPointer::getClientHelloServerName() const {
4317-
if (ssl_ == nullptr) return {};
4318-
#ifndef OPENSSL_IS_BORINGSSL
4319-
constunsignedchar* buf;
4320-
size_t len;
4321-
size_t rem;
4322-
4323-
if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
4324-
 rem <= 2) {
4325-
return {};
4326-
 }
4327-
4328-
 len = (*buf << 8) | *(buf + 1);
4329-
if (len + 2 != rem) return {};
4330-
 rem = len;
4331-
4332-
if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
4333-
 rem--;
4334-
if (rem <= 2) return {};
4335-
 len = (*(buf + 3) << 8) | *(buf + 4);
4336-
if (len + 2 > rem) return {};
4337-
returnreinterpret_cast<constchar*>(buf + 5);
4338-
#else
4339-
// Boringssl doesn't have a public API for this.
4340-
return {};
4341-
#endif
4342-
}
4343-
43444267
std::optional<const std::string_view> SSLPointer::GetServerName(
43454268
constSSL* ssl) {
43464269
if (ssl == nullptr) return std::nullopt;
‎deps/ncrypto/ncrypto.h‎
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,9 +1346,6 @@ class SSLPointer final {
13461346
boolsetSession(const SSLSessionPointer& session);
13471347
boolsetSniContext(const SSLCtxPointer& ctx) const;
13481348

1349-
constchar* getClientHelloAlpn() const;
1350-
constchar* getClientHelloServerName() const;
1351-
13521349
 std::optional<const std::string_view> getServerName() const;
13531350
 X509View getCertificate() const;
13541351
 EVPKeyPointer getPeerTempKey() const;
‎test/parallel/test-webcrypto-export-import-ml-kem.js‎
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,8 @@ async function testImportPkcs8({ name, privateUsages }, extractable) {
107107
}catch(err){
108108
if(process.features.openssl_is_boringssl){
109109
assert.strictEqual(err.name,'DataError');
110-
// It should really only be ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED
111-
// but BoringSSL is inconsistent between handling ML-KEM and ML-DSA
112-
// Fixed in https://github.com/google/boringssl/commit/94c4c7f9e0eeeff72ea1ac6abf1aed5bd2a82c0c
113-
assert.match(err.cause.code,/ERR_OSSL_EVP_UNSUPPORTED_ALGORITHM|ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED/);
110+
assert.strictEqual(err.cause.code,
111+
'ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED');
114112
common.printSkipMessage('Skipping unsupported private key format test');
115113
return;
116114
}
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 0e87576
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: remove obsolete BoringSSL shims
BoringSSL implements OPENSSL_zalloc and BN_secure_new and provides
compatible secure heap status stubs. Use the common code paths.
Remove ClientHello helpers left unused by the early callback migration
and require the fixed ML-KEM private-key import error.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #65423
Backport-PR-URL: #65483
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 17d2b06 commit 0e87576
3 files changed
Lines changed: 2 additions & 84 deletions
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {
396396

397397
// ============================================================================
398398
DataPointer DataPointer::Alloc(size_t len) {
399-
#ifdef OPENSSL_IS_BORINGSSL
400-
// Boringssl does not implement OPENSSL_zalloc
401-
auto ptr = OPENSSL_malloc(len);
402-
if (ptr == nullptr) return {};
403-
memset(ptr, 0, len);
404-
returnDataPointer(ptr, len);
405-
#else
406399
returnDataPointer(OPENSSL_zalloc(len), len);
407-
#endif
408400
}
409401

410402
DataPointer DataPointer::SecureAlloc(size_t len) {
@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
427419
}
428420

429421
size_tDataPointer::GetSecureHeapUsed() {
430-
#ifndef OPENSSL_IS_BORINGSSL
431422
returnCRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
432-
#else
433-
// BoringSSL does not have the secure heap and therefore
434-
// will always return 0.
435-
return0;
436-
#endif
437423
}
438424

439425
DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
440426
size_t min) {
441-
#ifndef OPENSSL_IS_BORINGSSL
442427
switch (CRYPTO_secure_malloc_init(amount, min)) {
443428
case0:
444429
return InitSecureHeapResult::FAILED;
@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
449434
default:
450435
return InitSecureHeapResult::FAILED;
451436
 }
452-
#else
453-
// BoringSSL does not actually support the secure heap
454-
return InitSecureHeapResult::FAILED;
455-
#endif
456437
}
457438

458439
DataPointer DataPointer::Copy(const Buffer<constvoid>& buffer) {
@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
580561
}
581562

582563
BignumPointer BignumPointer::NewSecure() {
583-
#ifdef OPENSSL_IS_BORINGSSL
584-
// Boringssl does not implement BN_secure_new.
585-
returnNew();
586-
#else
587564
returnBignumPointer(BN_secure_new());
588-
#endif
589565
}
590566

591567
BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
@@ -4288,59 +4264,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
42884264
return std::nullopt;
42894265
}
42904266

4291-
constchar* SSLPointer::getClientHelloAlpn() const {
4292-
if (ssl_ == nullptr) return {};
4293-
#ifndef OPENSSL_IS_BORINGSSL
4294-
constunsignedchar* buf;
4295-
size_t len;
4296-
size_t rem;
4297-
4298-
if (!SSL_client_hello_get0_ext(
4299-
get(),
4300-
 TLSEXT_TYPE_application_layer_protocol_negotiation,
4301-
 &buf,
4302-
 &rem) ||
4303-
 rem < 2) {
4304-
return {};
4305-
 }
4306-
4307-
 len = (buf[0] << 8) | buf[1];
4308-
if (len + 2 != rem) return {};
4309-
returnreinterpret_cast<constchar*>(buf + 3);
4310-
#else
4311-
// Boringssl doesn't have a public API for this.
4312-
return {};
4313-
#endif
4314-
}
4315-
4316-
constchar* SSLPointer::getClientHelloServerName() const {
4317-
if (ssl_ == nullptr) return {};
4318-
#ifndef OPENSSL_IS_BORINGSSL
4319-
constunsignedchar* buf;
4320-
size_t len;
4321-
size_t rem;
4322-
4323-
if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
4324-
 rem <= 2) {
4325-
return {};
4326-
 }
4327-
4328-
 len = (*buf << 8) | *(buf + 1);
4329-
if (len + 2 != rem) return {};
4330-
 rem = len;
4331-
4332-
if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
4333-
 rem--;
4334-
if (rem <= 2) return {};
4335-
 len = (*(buf + 3) << 8) | *(buf + 4);
4336-
if (len + 2 > rem) return {};
4337-
returnreinterpret_cast<constchar*>(buf + 5);
4338-
#else
4339-
// Boringssl doesn't have a public API for this.
4340-
return {};
4341-
#endif
4342-
}
4343-
43444267
std::optional<const std::string_view> SSLPointer::GetServerName(
43454268
constSSL* ssl) {
43464269
if (ssl == nullptr) return std::nullopt;
‎deps/ncrypto/ncrypto.h‎
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,9 +1346,6 @@ class SSLPointer final {
13461346
boolsetSession(const SSLSessionPointer& session);
13471347
boolsetSniContext(const SSLCtxPointer& ctx) const;
13481348

1349-
constchar* getClientHelloAlpn() const;
1350-
constchar* getClientHelloServerName() const;
1351-
13521349
 std::optional<const std::string_view> getServerName() const;
13531350
 X509View getCertificate() const;
13541351
 EVPKeyPointer getPeerTempKey() const;
‎test/parallel/test-webcrypto-export-import-ml-kem.js‎
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,8 @@ async function testImportPkcs8({ name, privateUsages }, extractable) {
107107
}catch(err){
108108
if(process.features.openssl_is_boringssl){
109109
assert.strictEqual(err.name,'DataError');
110-
// It should really only be ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED
111-
// but BoringSSL is inconsistent between handling ML-KEM and ML-DSA
112-
// Fixed in https://github.com/google/boringssl/commit/94c4c7f9e0eeeff72ea1ac6abf1aed5bd2a82c0c
113-
assert.match(err.cause.code,/ERR_OSSL_EVP_UNSUPPORTED_ALGORITHM|ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED/);
110+
assert.strictEqual(err.cause.code,
111+
'ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED');
114112
common.printSkipMessage('Skipping unsupported private key format test');
115113
return;
116114
}
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 0e87576
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: remove obsolete BoringSSL shims
BoringSSL implements OPENSSL_zalloc and BN_secure_new and provides
compatible secure heap status stubs. Use the common code paths.
Remove ClientHello helpers left unused by the early callback migration
and require the fixed ML-KEM private-key import error.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #65423
Backport-PR-URL: #65483
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 17d2b06 commit 0e87576
3 files changed
Lines changed: 2 additions & 84 deletions
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {
396396

397397
// ============================================================================
398398
DataPointer DataPointer::Alloc(size_t len) {
399-
#ifdef OPENSSL_IS_BORINGSSL
400-
// Boringssl does not implement OPENSSL_zalloc
401-
auto ptr = OPENSSL_malloc(len);
402-
if (ptr == nullptr) return {};
403-
memset(ptr, 0, len);
404-
returnDataPointer(ptr, len);
405-
#else
406399
returnDataPointer(OPENSSL_zalloc(len), len);
407-
#endif
408400
}
409401

410402
DataPointer DataPointer::SecureAlloc(size_t len) {
@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
427419
}
428420

429421
size_tDataPointer::GetSecureHeapUsed() {
430-
#ifndef OPENSSL_IS_BORINGSSL
431422
returnCRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
432-
#else
433-
// BoringSSL does not have the secure heap and therefore
434-
// will always return 0.
435-
return0;
436-
#endif
437423
}
438424

439425
DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
440426
size_t min) {
441-
#ifndef OPENSSL_IS_BORINGSSL
442427
switch (CRYPTO_secure_malloc_init(amount, min)) {
443428
case0:
444429
return InitSecureHeapResult::FAILED;
@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
449434
default:
450435
return InitSecureHeapResult::FAILED;
451436
 }
452-
#else
453-
// BoringSSL does not actually support the secure heap
454-
return InitSecureHeapResult::FAILED;
455-
#endif
456437
}
457438

458439
DataPointer DataPointer::Copy(const Buffer<constvoid>& buffer) {
@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
580561
}
581562

582563
BignumPointer BignumPointer::NewSecure() {
583-
#ifdef OPENSSL_IS_BORINGSSL
584-
// Boringssl does not implement BN_secure_new.
585-
returnNew();
586-
#else
587564
returnBignumPointer(BN_secure_new());
588-
#endif
589565
}
590566

591567
BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
@@ -4288,59 +4264,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
42884264
return std::nullopt;
42894265
}
42904266

4291-
constchar* SSLPointer::getClientHelloAlpn() const {
4292-
if (ssl_ == nullptr) return {};
4293-
#ifndef OPENSSL_IS_BORINGSSL
4294-
constunsignedchar* buf;
4295-
size_t len;
4296-
size_t rem;
4297-
4298-
if (!SSL_client_hello_get0_ext(
4299-
get(),
4300-
 TLSEXT_TYPE_application_layer_protocol_negotiation,
4301-
 &buf,
4302-
 &rem) ||
4303-
 rem < 2) {
4304-
return {};
4305-
 }
4306-
4307-
 len = (buf[0] << 8) | buf[1];
4308-
if (len + 2 != rem) return {};
4309-
returnreinterpret_cast<constchar*>(buf + 3);
4310-
#else
4311-
// Boringssl doesn't have a public API for this.
4312-
return {};
4313-
#endif
4314-
}
4315-
4316-
constchar* SSLPointer::getClientHelloServerName() const {
4317-
if (ssl_ == nullptr) return {};
4318-
#ifndef OPENSSL_IS_BORINGSSL
4319-
constunsignedchar* buf;
4320-
size_t len;
4321-
size_t rem;
4322-
4323-
if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
4324-
 rem <= 2) {
4325-
return {};
4326-
 }
4327-
4328-
 len = (*buf << 8) | *(buf + 1);
4329-
if (len + 2 != rem) return {};
4330-
 rem = len;
4331-
4332-
if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
4333-
 rem--;
4334-
if (rem <= 2) return {};
4335-
 len = (*(buf + 3) << 8) | *(buf + 4);
4336-
if (len + 2 > rem) return {};
4337-
returnreinterpret_cast<constchar*>(buf + 5);
4338-
#else
4339-
// Boringssl doesn't have a public API for this.
4340-
return {};
4341-
#endif
4342-
}
4343-
43444267
std::optional<const std::string_view> SSLPointer::GetServerName(
43454268
constSSL* ssl) {
43464269
if (ssl == nullptr) return std::nullopt;
‎deps/ncrypto/ncrypto.h‎
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,9 +1346,6 @@ class SSLPointer final {
13461346
boolsetSession(const SSLSessionPointer& session);
13471347
boolsetSniContext(const SSLCtxPointer& ctx) const;
13481348

1349-
constchar* getClientHelloAlpn() const;
1350-
constchar* getClientHelloServerName() const;
1351-
13521349
 std::optional<const std::string_view> getServerName() const;
13531350
 X509View getCertificate() const;
13541351
 EVPKeyPointer getPeerTempKey() const;
‎test/parallel/test-webcrypto-export-import-ml-kem.js‎
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,8 @@ async function testImportPkcs8({ name, privateUsages }, extractable) {
107107
}catch(err){
108108
if(process.features.openssl_is_boringssl){
109109
assert.strictEqual(err.name,'DataError');
110-
// It should really only be ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED
111-
// but BoringSSL is inconsistent between handling ML-KEM and ML-DSA
112-
// Fixed in https://github.com/google/boringssl/commit/94c4c7f9e0eeeff72ea1ac6abf1aed5bd2a82c0c
113-
assert.match(err.cause.code,/ERR_OSSL_EVP_UNSUPPORTED_ALGORITHM|ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED/);
110+
assert.strictEqual(err.cause.code,
111+
'ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED');
114112
common.printSkipMessage('Skipping unsupported private key format test');
115113
return;
116114
}
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 0e87576
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: remove obsolete BoringSSL shims
BoringSSL implements OPENSSL_zalloc and BN_secure_new and provides
compatible secure heap status stubs. Use the common code paths.
Remove ClientHello helpers left unused by the early callback migration
and require the fixed ML-KEM private-key import error.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #65423
Backport-PR-URL: #65483
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 17d2b06 commit 0e87576
3 files changed
Lines changed: 2 additions & 84 deletions
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {
396396

397397
// ============================================================================
398398
DataPointer DataPointer::Alloc(size_t len) {
399-
#ifdef OPENSSL_IS_BORINGSSL
400-
// Boringssl does not implement OPENSSL_zalloc
401-
auto ptr = OPENSSL_malloc(len);
402-
if (ptr == nullptr) return {};
403-
memset(ptr, 0, len);
404-
returnDataPointer(ptr, len);
405-
#else
406399
returnDataPointer(OPENSSL_zalloc(len), len);
407-
#endif
408400
}
409401

410402
DataPointer DataPointer::SecureAlloc(size_t len) {
@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
427419
}
428420

429421
size_tDataPointer::GetSecureHeapUsed() {
430-
#ifndef OPENSSL_IS_BORINGSSL
431422
returnCRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
432-
#else
433-
// BoringSSL does not have the secure heap and therefore
434-
// will always return 0.
435-
return0;
436-
#endif
437423
}
438424

439425
DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
440426
size_t min) {
441-
#ifndef OPENSSL_IS_BORINGSSL
442427
switch (CRYPTO_secure_malloc_init(amount, min)) {
443428
case0:
444429
return InitSecureHeapResult::FAILED;
@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
449434
default:
450435
return InitSecureHeapResult::FAILED;
451436
 }
452-
#else
453-
// BoringSSL does not actually support the secure heap
454-
return InitSecureHeapResult::FAILED;
455-
#endif
456437
}
457438

458439
DataPointer DataPointer::Copy(const Buffer<constvoid>& buffer) {
@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
580561
}
581562

582563
BignumPointer BignumPointer::NewSecure() {
583-
#ifdef OPENSSL_IS_BORINGSSL
584-
// Boringssl does not implement BN_secure_new.
585-
returnNew();
586-
#else
587564
returnBignumPointer(BN_secure_new());
588-
#endif
589565
}
590566

591567
BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
@@ -4288,59 +4264,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
42884264
return std::nullopt;
42894265
}
42904266

4291-
constchar* SSLPointer::getClientHelloAlpn() const {
4292-
if (ssl_ == nullptr) return {};
4293-
#ifndef OPENSSL_IS_BORINGSSL
4294-
constunsignedchar* buf;
4295-
size_t len;
4296-
size_t rem;
4297-
4298-
if (!SSL_client_hello_get0_ext(
4299-
get(),
4300-
 TLSEXT_TYPE_application_layer_protocol_negotiation,
4301-
 &buf,
4302-
 &rem) ||
4303-
 rem < 2) {
4304-
return {};
4305-
 }
4306-
4307-
 len = (buf[0] << 8) | buf[1];
4308-
if (len + 2 != rem) return {};
4309-
returnreinterpret_cast<constchar*>(buf + 3);
4310-
#else
4311-
// Boringssl doesn't have a public API for this.
4312-
return {};
4313-
#endif
4314-
}
4315-
4316-
constchar* SSLPointer::getClientHelloServerName() const {
4317-
if (ssl_ == nullptr) return {};
4318-
#ifndef OPENSSL_IS_BORINGSSL
4319-
constunsignedchar* buf;
4320-
size_t len;
4321-
size_t rem;
4322-
4323-
if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
4324-
 rem <= 2) {
4325-
return {};
4326-
 }
4327-
4328-
 len = (*buf << 8) | *(buf + 1);
4329-
if (len + 2 != rem) return {};
4330-
 rem = len;
4331-
4332-
if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
4333-
 rem--;
4334-
if (rem <= 2) return {};
4335-
 len = (*(buf + 3) << 8) | *(buf + 4);
4336-
if (len + 2 > rem) return {};
4337-
returnreinterpret_cast<constchar*>(buf + 5);
4338-
#else
4339-
// Boringssl doesn't have a public API for this.
4340-
return {};
4341-
#endif
4342-
}
4343-
43444267
std::optional<const std::string_view> SSLPointer::GetServerName(
43454268
constSSL* ssl) {
43464269
if (ssl == nullptr) return std::nullopt;
‎deps/ncrypto/ncrypto.h‎
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,9 +1346,6 @@ class SSLPointer final {
13461346
boolsetSession(const SSLSessionPointer& session);
13471347
boolsetSniContext(const SSLCtxPointer& ctx) const;
13481348

1349-
constchar* getClientHelloAlpn() const;
1350-
constchar* getClientHelloServerName() const;
1351-
13521349
 std::optional<const std::string_view> getServerName() const;
13531350
 X509View getCertificate() const;
13541351
 EVPKeyPointer getPeerTempKey() const;
‎test/parallel/test-webcrypto-export-import-ml-kem.js‎
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,8 @@ async function testImportPkcs8({ name, privateUsages }, extractable) {
107107
}catch(err){
108108
if(process.features.openssl_is_boringssl){
109109
assert.strictEqual(err.name,'DataError');
110-
// It should really only be ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED
111-
// but BoringSSL is inconsistent between handling ML-KEM and ML-DSA
112-
// Fixed in https://github.com/google/boringssl/commit/94c4c7f9e0eeeff72ea1ac6abf1aed5bd2a82c0c
113-
assert.match(err.cause.code,/ERR_OSSL_EVP_UNSUPPORTED_ALGORITHM|ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED/);
110+
assert.strictEqual(err.cause.code,
111+
'ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED');
114112
common.printSkipMessage('Skipping unsupported private key format test');
115113
return;
116114
}
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 0e87576
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: remove obsolete BoringSSL shims
BoringSSL implements OPENSSL_zalloc and BN_secure_new and provides
compatible secure heap status stubs. Use the common code paths.
Remove ClientHello helpers left unused by the early callback migration
and require the fixed ML-KEM private-key import error.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #65423
Backport-PR-URL: #65483
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 17d2b06 commit 0e87576
3 files changed
Lines changed: 2 additions & 84 deletions
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {
396396

397397
// ============================================================================
398398
DataPointer DataPointer::Alloc(size_t len) {
399-
#ifdef OPENSSL_IS_BORINGSSL
400-
// Boringssl does not implement OPENSSL_zalloc
401-
auto ptr = OPENSSL_malloc(len);
402-
if (ptr == nullptr) return {};
403-
memset(ptr, 0, len);
404-
returnDataPointer(ptr, len);
405-
#else
406399
returnDataPointer(OPENSSL_zalloc(len), len);
407-
#endif
408400
}
409401

410402
DataPointer DataPointer::SecureAlloc(size_t len) {
@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
427419
}
428420

429421
size_tDataPointer::GetSecureHeapUsed() {
430-
#ifndef OPENSSL_IS_BORINGSSL
431422
returnCRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
432-
#else
433-
// BoringSSL does not have the secure heap and therefore
434-
// will always return 0.
435-
return0;
436-
#endif
437423
}
438424

439425
DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
440426
size_t min) {
441-
#ifndef OPENSSL_IS_BORINGSSL
442427
switch (CRYPTO_secure_malloc_init(amount, min)) {
443428
case0:
444429
return InitSecureHeapResult::FAILED;
@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
449434
default:
450435
return InitSecureHeapResult::FAILED;
451436
 }
452-
#else
453-
// BoringSSL does not actually support the secure heap
454-
return InitSecureHeapResult::FAILED;
455-
#endif
456437
}
457438

458439
DataPointer DataPointer::Copy(const Buffer<constvoid>& buffer) {
@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
580561
}
581562

582563
BignumPointer BignumPointer::NewSecure() {
583-
#ifdef OPENSSL_IS_BORINGSSL
584-
// Boringssl does not implement BN_secure_new.
585-
returnNew();
586-
#else
587564
returnBignumPointer(BN_secure_new());
588-
#endif
589565
}
590566

591567
BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
@@ -4288,59 +4264,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
42884264
return std::nullopt;
42894265
}
42904266

4291-
constchar* SSLPointer::getClientHelloAlpn() const {
4292-
if (ssl_ == nullptr) return {};
4293-
#ifndef OPENSSL_IS_BORINGSSL
4294-
constunsignedchar* buf;
4295-
size_t len;
4296-
size_t rem;
4297-
4298-
if (!SSL_client_hello_get0_ext(
4299-
get(),
4300-
 TLSEXT_TYPE_application_layer_protocol_negotiation,
4301-
 &buf,
4302-
 &rem) ||
4303-
 rem < 2) {
4304-
return {};
4305-
 }
4306-
4307-
 len = (buf[0] << 8) | buf[1];
4308-
if (len + 2 != rem) return {};
4309-
returnreinterpret_cast<constchar*>(buf + 3);
4310-
#else
4311-
// Boringssl doesn't have a public API for this.
4312-
return {};
4313-
#endif
4314-
}
4315-
4316-
constchar* SSLPointer::getClientHelloServerName() const {
4317-
if (ssl_ == nullptr) return {};
4318-
#ifndef OPENSSL_IS_BORINGSSL
4319-
constunsignedchar* buf;
4320-
size_t len;
4321-
size_t rem;
4322-
4323-
if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
4324-
 rem <= 2) {
4325-
return {};
4326-
 }
4327-
4328-
 len = (*buf << 8) | *(buf + 1);
4329-
if (len + 2 != rem) return {};
4330-
 rem = len;
4331-
4332-
if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
4333-
 rem--;
4334-
if (rem <= 2) return {};
4335-
 len = (*(buf + 3) << 8) | *(buf + 4);
4336-
if (len + 2 > rem) return {};
4337-
returnreinterpret_cast<constchar*>(buf + 5);
4338-
#else
4339-
// Boringssl doesn't have a public API for this.
4340-
return {};
4341-
#endif
4342-
}
4343-
43444267
std::optional<const std::string_view> SSLPointer::GetServerName(
43454268
constSSL* ssl) {
43464269
if (ssl == nullptr) return std::nullopt;
‎deps/ncrypto/ncrypto.h‎
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,9 +1346,6 @@ class SSLPointer final {
13461346
boolsetSession(const SSLSessionPointer& session);
13471347
boolsetSniContext(const SSLCtxPointer& ctx) const;
13481348

1349-
constchar* getClientHelloAlpn() const;
1350-
constchar* getClientHelloServerName() const;
1351-
13521349
 std::optional<const std::string_view> getServerName() const;
13531350
 X509View getCertificate() const;
13541351
 EVPKeyPointer getPeerTempKey() const;
‎test/parallel/test-webcrypto-export-import-ml-kem.js‎
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,8 @@ async function testImportPkcs8({ name, privateUsages }, extractable) {
107107
}catch(err){
108108
if(process.features.openssl_is_boringssl){
109109
assert.strictEqual(err.name,'DataError');
110-
// It should really only be ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED
111-
// but BoringSSL is inconsistent between handling ML-KEM and ML-DSA
112-
// Fixed in https://github.com/google/boringssl/commit/94c4c7f9e0eeeff72ea1ac6abf1aed5bd2a82c0c
113-
assert.match(err.cause.code,/ERR_OSSL_EVP_UNSUPPORTED_ALGORITHM|ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED/);
110+
assert.strictEqual(err.cause.code,
111+
'ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED');
114112
common.printSkipMessage('Skipping unsupported private key format test');
115113
return;
116114
}
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 0e87576
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: remove obsolete BoringSSL shims
BoringSSL implements OPENSSL_zalloc and BN_secure_new and provides
compatible secure heap status stubs. Use the common code paths.
Remove ClientHello helpers left unused by the early callback migration
and require the fixed ML-KEM private-key import error.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #65423
Backport-PR-URL: #65483
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 17d2b06 commit 0e87576
3 files changed
Lines changed: 2 additions & 84 deletions
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {
396396

397397
// ============================================================================
398398
DataPointer DataPointer::Alloc(size_t len) {
399-
#ifdef OPENSSL_IS_BORINGSSL
400-
// Boringssl does not implement OPENSSL_zalloc
401-
auto ptr = OPENSSL_malloc(len);
402-
if (ptr == nullptr) return {};
403-
memset(ptr, 0, len);
404-
returnDataPointer(ptr, len);
405-
#else
406399
returnDataPointer(OPENSSL_zalloc(len), len);
407-
#endif
408400
}
409401

410402
DataPointer DataPointer::SecureAlloc(size_t len) {
@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
427419
}
428420

429421
size_tDataPointer::GetSecureHeapUsed() {
430-
#ifndef OPENSSL_IS_BORINGSSL
431422
returnCRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
432-
#else
433-
// BoringSSL does not have the secure heap and therefore
434-
// will always return 0.
435-
return0;
436-
#endif
437423
}
438424

439425
DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
440426
size_t min) {
441-
#ifndef OPENSSL_IS_BORINGSSL
442427
switch (CRYPTO_secure_malloc_init(amount, min)) {
443428
case0:
444429
return InitSecureHeapResult::FAILED;
@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
449434
default:
450435
return InitSecureHeapResult::FAILED;
451436
 }
452-
#else
453-
// BoringSSL does not actually support the secure heap
454-
return InitSecureHeapResult::FAILED;
455-
#endif
456437
}
457438

458439
DataPointer DataPointer::Copy(const Buffer<constvoid>& buffer) {
@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
580561
}
581562

582563
BignumPointer BignumPointer::NewSecure() {
583-
#ifdef OPENSSL_IS_BORINGSSL
584-
// Boringssl does not implement BN_secure_new.
585-
returnNew();
586-
#else
587564
returnBignumPointer(BN_secure_new());
588-
#endif
589565
}
590566

591567
BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
@@ -4288,59 +4264,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
42884264
return std::nullopt;
42894265
}
42904266

4291-
constchar* SSLPointer::getClientHelloAlpn() const {
4292-
if (ssl_ == nullptr) return {};
4293-
#ifndef OPENSSL_IS_BORINGSSL
4294-
constunsignedchar* buf;
4295-
size_t len;
4296-
size_t rem;
4297-
4298-
if (!SSL_client_hello_get0_ext(
4299-
get(),
4300-
 TLSEXT_TYPE_application_layer_protocol_negotiation,
4301-
 &buf,
4302-
 &rem) ||
4303-
 rem < 2) {
4304-
return {};
4305-
 }
4306-
4307-
 len = (buf[0] << 8) | buf[1];
4308-
if (len + 2 != rem) return {};
4309-
returnreinterpret_cast<constchar*>(buf + 3);
4310-
#else
4311-
// Boringssl doesn't have a public API for this.
4312-
return {};
4313-
#endif
4314-
}
4315-
4316-
constchar* SSLPointer::getClientHelloServerName() const {
4317-
if (ssl_ == nullptr) return {};
4318-
#ifndef OPENSSL_IS_BORINGSSL
4319-
constunsignedchar* buf;
4320-
size_t len;
4321-
size_t rem;
4322-
4323-
if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
4324-
 rem <= 2) {
4325-
return {};
4326-
 }
4327-
4328-
 len = (*buf << 8) | *(buf + 1);
4329-
if (len + 2 != rem) return {};
4330-
 rem = len;
4331-
4332-
if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
4333-
 rem--;
4334-
if (rem <= 2) return {};
4335-
 len = (*(buf + 3) << 8) | *(buf + 4);
4336-
if (len + 2 > rem) return {};
4337-
returnreinterpret_cast<constchar*>(buf + 5);
4338-
#else
4339-
// Boringssl doesn't have a public API for this.
4340-
return {};
4341-
#endif
4342-
}
4343-
43444267
std::optional<const std::string_view> SSLPointer::GetServerName(
43454268
constSSL* ssl) {
43464269
if (ssl == nullptr) return std::nullopt;
‎deps/ncrypto/ncrypto.h‎
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,9 +1346,6 @@ class SSLPointer final {
13461346
boolsetSession(const SSLSessionPointer& session);
13471347
boolsetSniContext(const SSLCtxPointer& ctx) const;
13481348

1349-
constchar* getClientHelloAlpn() const;
1350-
constchar* getClientHelloServerName() const;
1351-
13521349
 std::optional<const std::string_view> getServerName() const;
13531350
 X509View getCertificate() const;
13541351
 EVPKeyPointer getPeerTempKey() const;
‎test/parallel/test-webcrypto-export-import-ml-kem.js‎
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,8 @@ async function testImportPkcs8({ name, privateUsages }, extractable) {
107107
}catch(err){
108108
if(process.features.openssl_is_boringssl){
109109
assert.strictEqual(err.name,'DataError');
110-
// It should really only be ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED
111-
// but BoringSSL is inconsistent between handling ML-KEM and ML-DSA
112-
// Fixed in https://github.com/google/boringssl/commit/94c4c7f9e0eeeff72ea1ac6abf1aed5bd2a82c0c
113-
assert.match(err.cause.code,/ERR_OSSL_EVP_UNSUPPORTED_ALGORITHM|ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED/);
110+
assert.strictEqual(err.cause.code,
111+
'ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED');
114112
common.printSkipMessage('Skipping unsupported private key format test');
115113
return;
116114
}
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 0e87576
Browse files
panvaaduh95
panva
authored and
aduh95
committed
crypto: remove obsolete BoringSSL shims
BoringSSL implements OPENSSL_zalloc and BN_secure_new and provides
compatible secure heap status stubs. Use the common code paths.
Remove ClientHello helpers left unused by the early callback migration
and require the fixed ML-KEM private-key import error.
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #65423
Backport-PR-URL: #65483
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Tim Perry <pimterry@gmail.com>
1 parent 17d2b06 commit 0e87576
3 files changed
Lines changed: 2 additions & 84 deletions
File tree
‎deps/ncrypto/ncrypto.cc‎
Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {
396396

397397
// ============================================================================
398398
DataPointer DataPointer::Alloc(size_t len) {
399-
#ifdef OPENSSL_IS_BORINGSSL
400-
// Boringssl does not implement OPENSSL_zalloc
401-
auto ptr = OPENSSL_malloc(len);
402-
if (ptr == nullptr) return {};
403-
memset(ptr, 0, len);
404-
returnDataPointer(ptr, len);
405-
#else
406399
returnDataPointer(OPENSSL_zalloc(len), len);
407-
#endif
408400
}
409401

410402
DataPointer DataPointer::SecureAlloc(size_t len) {
@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
427419
}
428420

429421
size_tDataPointer::GetSecureHeapUsed() {
430-
#ifndef OPENSSL_IS_BORINGSSL
431422
returnCRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
432-
#else
433-
// BoringSSL does not have the secure heap and therefore
434-
// will always return 0.
435-
return0;
436-
#endif
437423
}
438424

439425
DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
440426
size_t min) {
441-
#ifndef OPENSSL_IS_BORINGSSL
442427
switch (CRYPTO_secure_malloc_init(amount, min)) {
443428
case0:
444429
return InitSecureHeapResult::FAILED;
@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
449434
default:
450435
return InitSecureHeapResult::FAILED;
451436
 }
452-
#else
453-
// BoringSSL does not actually support the secure heap
454-
return InitSecureHeapResult::FAILED;
455-
#endif
456437
}
457438

458439
DataPointer DataPointer::Copy(const Buffer<constvoid>& buffer) {
@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
580561
}
581562

582563
BignumPointer BignumPointer::NewSecure() {
583-
#ifdef OPENSSL_IS_BORINGSSL
584-
// Boringssl does not implement BN_secure_new.
585-
returnNew();
586-
#else
587564
returnBignumPointer(BN_secure_new());
588-
#endif
589565
}
590566

591567
BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
@@ -4288,59 +4264,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
42884264
return std::nullopt;
42894265
}
42904266

4291-
constchar* SSLPointer::getClientHelloAlpn() const {
4292-
if (ssl_ == nullptr) return {};
4293-
#ifndef OPENSSL_IS_BORINGSSL
4294-
constunsignedchar* buf;
4295-
size_t len;
4296-
size_t rem;
4297-
4298-
if (!SSL_client_hello_get0_ext(
4299-
get(),
4300-
 TLSEXT_TYPE_application_layer_protocol_negotiation,
4301-
 &buf,
4302-
 &rem) ||
4303-
 rem < 2) {
4304-
return {};
4305-
 }
4306-
4307-
 len = (buf[0] << 8) | buf[1];
4308-
if (len + 2 != rem) return {};
4309-
returnreinterpret_cast<constchar*>(buf + 3);
4310-
#else
4311-
// Boringssl doesn't have a public API for this.
4312-
return {};
4313-
#endif
4314-
}
4315-
4316-
constchar* SSLPointer::getClientHelloServerName() const {
4317-
if (ssl_ == nullptr) return {};
4318-
#ifndef OPENSSL_IS_BORINGSSL
4319-
constunsignedchar* buf;
4320-
size_t len;
4321-
size_t rem;
4322-
4323-
if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
4324-
 rem <= 2) {
4325-
return {};
4326-
 }
4327-
4328-
 len = (*buf << 8) | *(buf + 1);
4329-
if (len + 2 != rem) return {};
4330-
 rem = len;
4331-
4332-
if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
4333-
 rem--;
4334-
if (rem <= 2) return {};
4335-
 len = (*(buf + 3) << 8) | *(buf + 4);
4336-
if (len + 2 > rem) return {};
4337-
returnreinterpret_cast<constchar*>(buf + 5);
4338-
#else
4339-
// Boringssl doesn't have a public API for this.
4340-
return {};
4341-
#endif
4342-
}
4343-
43444267
std::optional<const std::string_view> SSLPointer::GetServerName(
43454268
constSSL* ssl) {
43464269
if (ssl == nullptr) return std::nullopt;
‎deps/ncrypto/ncrypto.h‎
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,9 +1346,6 @@ class SSLPointer final {
13461346
boolsetSession(const SSLSessionPointer& session);
13471347
boolsetSniContext(const SSLCtxPointer& ctx) const;
13481348

1349-
constchar* getClientHelloAlpn() const;
1350-
constchar* getClientHelloServerName() const;
1351-
13521349
 std::optional<const std::string_view> getServerName() const;
13531350
 X509View getCertificate() const;
13541351
 EVPKeyPointer getPeerTempKey() const;
‎test/parallel/test-webcrypto-export-import-ml-kem.js‎
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,8 @@ async function testImportPkcs8({ name, privateUsages }, extractable) {
107107
}catch(err){
108108
if(process.features.openssl_is_boringssl){
109109
assert.strictEqual(err.name,'DataError');
110-
// It should really only be ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED
111-
// but BoringSSL is inconsistent between handling ML-KEM and ML-DSA
112-
// Fixed in https://github.com/google/boringssl/commit/94c4c7f9e0eeeff72ea1ac6abf1aed5bd2a82c0c
113-
assert.match(err.cause.code,/ERR_OSSL_EVP_UNSUPPORTED_ALGORITHM|ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED/);
110+
assert.strictEqual(err.cause.code,
111+
'ERR_OSSL_EVP_PRIVATE_KEY_WAS_NOT_SEED');
114112
common.printSkipMessage('Skipping unsupported private key format test');
115113
return;
116114
}
0 commit comments
Comments
 (0)