crypto: remove obsolete BoringSSL shims and use available APIs#65423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
panva wants to merge 3 commits into from
Closed

crypto: remove obsolete BoringSSL shims and use available APIs #65423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20c21a5
crypto: remove obsolete BoringSSL shims
panva Aug 20, 2026
932b0fc
crypto: use available BoringSSL APIs
panva Aug 20, 2026
60d2e08
fixup! crypto: use available BoringSSL APIs
panva Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 11 additions & 86 deletions deps/ncrypto/ncrypto.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {

// ============================================================================
DataPointer DataPointer::Alloc(size_t len) {
#ifdef OPENSSL_IS_BORINGSSL
// Boringssl does not implement OPENSSL_zalloc
auto ptr = OPENSSL_malloc(len);
if (ptr == nullptr) return {};
memset(ptr, 0, len);
return DataPointer(ptr, len);
#else
return DataPointer(OPENSSL_zalloc(len), len);
#endif
}

DataPointer DataPointer::SecureAlloc(size_t len) {
Expand All@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
}

size_t DataPointer::GetSecureHeapUsed() {
#ifndef OPENSSL_IS_BORINGSSL
return CRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
#else
// BoringSSL does not have the secure heap and therefore
// will always return 0.
return 0;
#endif
}

DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
size_t min) {
#ifndef OPENSSL_IS_BORINGSSL
switch (CRYPTO_secure_malloc_init(amount, min)) {
case 0:
return InitSecureHeapResult::FAILED;
Expand All@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
default:
return InitSecureHeapResult::FAILED;
}
#else
// BoringSSL does not actually support the secure heap
return InitSecureHeapResult::FAILED;
#endif
}

DataPointer DataPointer::Copy(const Buffer<const void>& buffer) {
Expand DownExpand Up@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
}

BignumPointer BignumPointer::NewSecure() {
#ifdef OPENSSL_IS_BORINGSSL
// Boringssl does not implement BN_secure_new.
return New();
#else
return BignumPointer(BN_secure_new());
#endif
}

BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
Expand DownExpand Up@@ -2276,14 +2252,11 @@ DHPointer::CheckPublicKeyResult DHPointer::checkPublicKey(
if (DH_check_pub_key(dh_.get(), pub_key.get(), &codes) != 1) {
return DHPointer::CheckPublicKeyResult::CHECK_FAILED;
}
#ifndef OPENSSL_IS_BORINGSSL
// Boringssl does not define DH_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
if (codes & DH_CHECK_PUBKEY_TOO_SMALL) {
return DHPointer::CheckPublicKeyResult::TOO_SMALL;
} else if (codes & DH_CHECK_PUBKEY_TOO_LARGE) {
return DHPointer::CheckPublicKeyResult::TOO_LARGE;
}
#endif
if (codes != 0) {
return DHPointer::CheckPublicKeyResult::INVALID;
}
Expand DownExpand Up@@ -4288,59 +4261,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
return std::nullopt;
}

const char* SSLPointer::getClientHelloAlpn() const {
if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
const unsigned char* buf;
size_t len;
size_t rem;

if (!SSL_client_hello_get0_ext(
get(),
TLSEXT_TYPE_application_layer_protocol_negotiation,
&buf,
&rem) ||
rem < 2) {
return {};
}

len = (buf[0] << 8) | buf[1];
if (len + 2 != rem) return {};
return reinterpret_cast<const char*>(buf + 3);
#else
// Boringssl doesn't have a public API for this.
return {};
#endif
}

const char* SSLPointer::getClientHelloServerName() const {
if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
const unsigned char* buf;
size_t len;
size_t rem;

if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
rem <= 2) {
return {};
}

len = (*buf << 8) | *(buf + 1);
if (len + 2 != rem) return {};
rem = len;

if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
rem--;
if (rem <= 2) return {};
len = (*(buf + 3) << 8) | *(buf + 4);
if (len + 2 > rem) return {};
return reinterpret_cast<const char*>(buf + 5);
#else
// Boringssl doesn't have a public API for this.
return {};
#endif
}

std::optional<const std::string_view> SSLPointer::GetServerName(
const SSL* ssl) {
if (ssl == nullptr) return std::nullopt;
Expand DownExpand Up@@ -4386,6 +4306,13 @@ std::optional<std::string_view> SSLPointer::getNegotiatedGroup() const {
const char* group = SSL_get0_group_name(get());
if (group == nullptr) return std::nullopt;
return group;
#elif defined(OPENSSL_IS_BORINGSSL)
if (!ssl_) return std::nullopt;
const int nid = SSL_get_negotiated_group(get());
if (nid == NID_undef) return std::nullopt;
const char* group = OBJ_nid2sn(nid);
if (group == nullptr) return std::nullopt;
return group;
#else
return std::nullopt;
#endif
Expand All@@ -4410,19 +4337,17 @@ std::optional<std::string_view> SSLPointer::getCipherVersion() const {
}

std::optional<int> SSLPointer::getSecurityLevel() {
#ifndef OPENSSL_IS_BORINGSSL
auto ctx = SSLCtxPointer::New();
if (!ctx) return std::nullopt;

#ifdef OPENSSL_IS_BORINGSSL
return SSL_CTX_get_security_level(ctx.get());
#else
auto ssl = SSLPointer::New(ctx);
if (!ssl) return std::nullopt;

return SSL_get_security_level(ssl);
#else
// OPENSSL_TLS_SECURITY_LEVEL is not defined in BoringSSL
// so assume it is the default OPENSSL_TLS_SECURITY_LEVEL value.
return 1;
#endif // OPENSSL_IS_BORINGSSL
#endif
}

SSLCtxPointer::SSLCtxPointer(SSL_CTX* ctx) : ctx_(ctx) {}
Expand Down
18 changes: 5 additions & 13 deletions deps/ncrypto/ncrypto.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1231,9 +1231,9 @@ class DHPointer final {
UNABLE_TO_CHECK_GENERATOR = 0x04,
NOT_SUITABLE_GENERATOR = 0x08,
Q_NOT_PRIME = 0x10,
#ifndef OPENSSL_IS_BORINGSSL
// Boringssl does not define the DH_CHECK_INVALID_[Q or J]_VALUE
INVALID_Q = 0x20,
#ifndef OPENSSL_IS_BORINGSSL
// BoringSSL does not define DH_CHECK_INVALID_J_VALUE.
INVALID_J = 0x40,
Comment thread
panva marked this conversation as resolved.
MODULUS_TOO_SMALL = 0x80,
MODULUS_TOO_LARGE = 0x100,
Expand All@@ -1244,14 +1244,9 @@ class DHPointer final {

enum class CheckPublicKeyResult {
NONE,
#ifndef OPENSSL_IS_BORINGSSL
// Boringssl does not define DH_R_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
TOO_SMALL = DH_R_CHECK_PUBKEY_TOO_SMALL,
TOO_LARGE = DH_R_CHECK_PUBKEY_TOO_LARGE,
INVALID = DH_R_CHECK_PUBKEY_INVALID,
#else
INVALID = DH_R_INVALID_PUBKEY,
#endif
TOO_SMALL,
TOO_LARGE,
INVALID,
CHECK_FAILED = 512,
};
// Check to see if the given public key is suitable for this DH instance.
Expand DownExpand Up@@ -1346,9 +1341,6 @@ class SSLPointer final {
bool setSession(const SSLSessionPointer& session);
bool setSniContext(const SSLCtxPointer& ctx) const;

const char* getClientHelloAlpn() const;
const char* getClientHelloServerName() const;

std::optional<const std::string_view> getServerName() const;
X509View getCertificate() const;
EVPKeyPointer getPeerTempKey() const;
Expand Down
2 changes: 0 additions & 2 deletions src/crypto/crypto_dh.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -319,12 +319,10 @@ void ComputeSecret(const FunctionCallbackInfo<Value>& args) {
case DHPointer::CheckPublicKeyResult::CHECK_FAILED:
return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env,
"Unspecified validation error");
#ifndef OPENSSL_IS_BORINGSSL
case DHPointer::CheckPublicKeyResult::TOO_SMALL:
return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too small");
case DHPointer::CheckPublicKeyResult::TOO_LARGE:
return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too large");
#endif
case DHPointer::CheckPublicKeyResult::INVALID:
return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env, "Supplied key is invalid");
case DHPointer::CheckPublicKeyResult::NONE:
Expand Down
12 changes: 0 additions & 12 deletions src/crypto/crypto_rsa.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,18 +137,6 @@ Maybe<void> RsaKeyGenTraits::AdditionalConfig(
params->params.modulus_bits = args[*offset + 1].As<Uint32>()->Value();
params->params.exponent = args[*offset + 2].As<Uint32>()->Value();

#ifdef OPENSSL_IS_BORINGSSL
// BoringSSL hangs indefinitely generating an RSA key with e=1, and for
// other invalid exponents (e=0, even values) reports the misleading error
// RSA_R_TOO_MANY_ITERATIONS only after running the full keygen loop. Reject
// those up-front with a clear error. The constraint here (odd integer >= 3)
// matches BoringSSL's own rsa_check_public_key validation.
if (params->params.exponent < 3 || (params->params.exponent & 1) == 0) {
THROW_ERR_OUT_OF_RANGE(env, "publicExponent is invalid");
return Nothing<void>();
}
#endif

*offset += 3;

if (params->params.variant == kKeyVariantRSA_PSS) {
Expand Down
13 changes: 5 additions & 8 deletions test/common/boringssl.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,12 +137,9 @@ function testRenegotiationUnsupported() {
}

/**
* OpenSSL exposes the negotiated ephemeral key type, name, and size for TLS
* clients. With BoringSSL the same ECDHE TLS 1.2 handshake succeeds, but
* getEphemeralKeyInfo() returns null on the server side and an object whose
* fields are undefined on the client side.
* BoringSSL exposes the negotiated TLS group but not the ephemeral key size.
*/
function testEphemeralKeyInfoUnsupported() {
function testEphemeralKeyInfo() {
const server = tls.createServer({
key: fixtures.readKey('agent2-key.pem'),
cert: fixtures.readKey('agent2-cert.pem'),
Expand All@@ -161,8 +158,8 @@ function testEphemeralKeyInfoUnsupported() {
maxVersion: 'TLSv1.2',
}, common.mustCall(() => {
assert.deepStrictEqual(client.getEphemeralKeyInfo(), {
type: undefined,
name: undefined,
type: 'TLSGroup',
name: 'prime256v1',
size: undefined,
});
server.close();
Expand DownExpand Up@@ -337,7 +334,7 @@ module.exports = {
assertMultiKeyUnsupported,
assertNoCipherMatch,
assertOpenSSLSecurityLevelsUnsupported,
testEphemeralKeyInfoUnsupported,
testEphemeralKeyInfo,
testLegacyProtocolUnsupported,
testMultiPfxSelectionDifference,
testPskTls13Unsupported,
Expand Down
50 changes: 25 additions & 25 deletions test/parallel/test-crypto-dh-curves.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,33 +35,33 @@ if (!process.features.openssl_is_boringssl) {
assert.strictEqual(
crypto.createDiffieHellman(notSafePrime, Buffer.from([2])).verifyError,
DH_CHECK_P_NOT_SAFE_PRIME);

const group = crypto.getDiffieHellman('modp14');
const alice = crypto.createDiffieHellman(
group.getPrime(), group.getGenerator());
alice.generateKeys();
const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
assert.throws(
() => alice.computeSecret(Buffer.from([1])),
{
code: 'ERR_CRYPTO_INVALID_KEYLEN',
message: 'Supplied key is too small'
});
assert.throws(
() => alice.computeSecret(group.getPrime()),
{
code: 'ERR_CRYPTO_INVALID_KEYLEN',
message: 'Supplied key is too large'
});
assert.throws(
() => alice.computeSecret(
Buffer.from((groupPrime - 1n).toString(16), 'hex')),
{
code: 'ERR_CRYPTO_INVALID_KEYLEN',
message: 'Supplied key is too large'
});
}

const group = crypto.getDiffieHellman('modp14');
const alice = crypto.createDiffieHellman(
group.getPrime(), group.getGenerator());
alice.generateKeys();
const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
assert.throws(
() => alice.computeSecret(Buffer.from([1])),
{
code: 'ERR_CRYPTO_INVALID_KEYLEN',
message: 'Supplied key is too small'
});
assert.throws(
() => alice.computeSecret(group.getPrime()),
{
code: 'ERR_CRYPTO_INVALID_KEYLEN',
message: 'Supplied key is too large'
});
assert.throws(
() => alice.computeSecret(
Buffer.from((groupPrime - 1n).toString(16), 'hex')),
{
code: 'ERR_CRYPTO_INVALID_KEYLEN',
message: 'Supplied key is too large'
});

// Confirm DH_check() results are exposed for optional examination.
const bad_dh = process.features.openssl_is_boringssl ?
crypto.createDiffieHellman('abcd', 'hex', 0) :
Expand Down
4 changes: 1 addition & 3 deletions test/parallel/test-crypto-dh.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ const {
{
assert.throws(() => {
dh3.computeSecret('');
}, { message: process.features.openssl_is_boringssl ?
'Supplied key is invalid' :
'Supplied key is too small' });
}, { message: 'Supplied key is too small' });
}
}

Expand Down
31 changes: 13 additions & 18 deletions test/parallel/test-crypto-keygen.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -376,25 +376,20 @@ const isBoringSSL = process.features.openssl_is_boringssl;
}

// Test invalid exponents. (caught by OpenSSL)
let invalidExponentError = /bad e value/;
if (isBoringSSL) {
invalidExponentError = /BAD_E_VALUE/;
} else if (hasOpenSSL3) {
invalidExponentError = /exponent/;
}
for (const publicExponent of [1, 1 + 0x10001]) {
if (isBoringSSL) {
assert.throws(() => generateKeyPair('rsa', {
modulusLength: 4096,
publicExponent
}, common.mustNotCall()), {
name: 'RangeError',
code: 'ERR_OUT_OF_RANGE',
message: 'publicExponent is invalid',
});
} else {
generateKeyPair('rsa', {
modulusLength: 4096,
publicExponent
}, common.mustCall((err) => {
assert.strictEqual(err.name, 'Error');
assert.match(err.message, hasOpenSSL3 ? /exponent/ : /bad e value/);
}));
}
generateKeyPair('rsa', {
modulusLength: 4096,
publicExponent
}, common.mustCall((err) => {
assert.strictEqual(err.name, 'Error');
assert.match(err.message, invalidExponentError);
}));
}
}

Expand Down
6 changes: 5 additions & 1 deletion test/parallel/test-crypto-sec-level.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,8 @@ const assert = require('assert');
// This test simply validates that we can get some value for the secLevel
// when needed by tests.
const secLevel = require('internal/crypto/util').getOpenSSLSecLevel();
assert.ok(secLevel >= 0 && secLevel <= 5);
if (process.features.openssl_is_boringssl) {
assert.strictEqual(secLevel, 0);
} else {
assert.ok(secLevel >= 0 && secLevel <= 5);
}
Loading
Loading
, '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
crypto: remove obsolete BoringSSL shims and use available APIs#65423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

panva
wants to merge
3
commits into

from

 Closed


crypto: remove obsolete BoringSSL shims and use available APIs
#65423
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
20c21a5

crypto: remove obsolete BoringSSL shims


panva Aug 20, 2026
932b0fc

crypto: use available BoringSSL APIs


panva Aug 20, 2026
60d2e08

fixup! crypto: use available BoringSSL APIs


panva Aug 20, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


97 changes: 11 additions & 86 deletions
deps/ncrypto/ncrypto.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {

// ============================================================================
DataPointer DataPointer::Alloc(size_t len) {
#ifdef OPENSSL_IS_BORINGSSL
 // Boringssl does not implement OPENSSL_zalloc
 auto ptr = OPENSSL_malloc(len);
 if (ptr == nullptr) return {};
 memset(ptr, 0, len);
 return DataPointer(ptr, len);
#else
 return DataPointer(OPENSSL_zalloc(len), len);
#endif
}

DataPointer DataPointer::SecureAlloc(size_t len) {
Expand All@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
}

size_t DataPointer::GetSecureHeapUsed() {
#ifndef OPENSSL_IS_BORINGSSL
 return CRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
#else
 // BoringSSL does not have the secure heap and therefore
 // will always return 0.
 return 0;
#endif
}

DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
 size_t min) {
#ifndef OPENSSL_IS_BORINGSSL
 switch (CRYPTO_secure_malloc_init(amount, min)) {
 case 0:
 return InitSecureHeapResult::FAILED;
Expand All@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
 default:
 return InitSecureHeapResult::FAILED;
 }
#else
 // BoringSSL does not actually support the secure heap
 return InitSecureHeapResult::FAILED;
#endif
}

DataPointer DataPointer::Copy(const Buffer<const void>& buffer) {
Expand DownExpand Up@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
}

BignumPointer BignumPointer::NewSecure() {
#ifdef OPENSSL_IS_BORINGSSL
 // Boringssl does not implement BN_secure_new.
 return New();
#else
 return BignumPointer(BN_secure_new());
#endif
}

BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
Expand DownExpand Up@@ -2276,14 +2252,11 @@ DHPointer::CheckPublicKeyResult DHPointer::checkPublicKey(
 if (DH_check_pub_key(dh_.get(), pub_key.get(), &codes) != 1) {
 return DHPointer::CheckPublicKeyResult::CHECK_FAILED;
 }
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define DH_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
 if (codes & DH_CHECK_PUBKEY_TOO_SMALL) {
 return DHPointer::CheckPublicKeyResult::TOO_SMALL;
 } else if (codes & DH_CHECK_PUBKEY_TOO_LARGE) {
 return DHPointer::CheckPublicKeyResult::TOO_LARGE;
 }
#endif
 if (codes != 0) {
 return DHPointer::CheckPublicKeyResult::INVALID;
 }
Expand DownExpand Up@@ -4288,59 +4261,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
 return std::nullopt;
}

const char* SSLPointer::getClientHelloAlpn() const {
 if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
 const unsigned char* buf;
 size_t len;
 size_t rem;

 if (!SSL_client_hello_get0_ext(
 get(),
 TLSEXT_TYPE_application_layer_protocol_negotiation,
 &buf,
 &rem) ||
 rem < 2) {
 return {};
 }

 len = (buf[0] << 8) | buf[1];
 if (len + 2 != rem) return {};
 return reinterpret_cast<const char*>(buf + 3);
#else
 // Boringssl doesn't have a public API for this.
 return {};
#endif
}

const char* SSLPointer::getClientHelloServerName() const {
 if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
 const unsigned char* buf;
 size_t len;
 size_t rem;

 if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
 rem <= 2) {
 return {};
 }

 len = (*buf << 8) | *(buf + 1);
 if (len + 2 != rem) return {};
 rem = len;

 if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
 rem--;
 if (rem <= 2) return {};
 len = (*(buf + 3) << 8) | *(buf + 4);
 if (len + 2 > rem) return {};
 return reinterpret_cast<const char*>(buf + 5);
#else
 // Boringssl doesn't have a public API for this.
 return {};
#endif
}

std::optional<const std::string_view> SSLPointer::GetServerName(
 const SSL* ssl) {
 if (ssl == nullptr) return std::nullopt;
Expand DownExpand Up@@ -4386,6 +4306,13 @@ std::optional<std::string_view> SSLPointer::getNegotiatedGroup() const {
 const char* group = SSL_get0_group_name(get());
 if (group == nullptr) return std::nullopt;
 return group;
#elif defined(OPENSSL_IS_BORINGSSL)
 if (!ssl_) return std::nullopt;
 const int nid = SSL_get_negotiated_group(get());
 if (nid == NID_undef) return std::nullopt;
 const char* group = OBJ_nid2sn(nid);
 if (group == nullptr) return std::nullopt;
 return group;
#else
 return std::nullopt;
#endif
Expand All@@ -4410,19 +4337,17 @@ std::optional<std::string_view> SSLPointer::getCipherVersion() const {
}

std::optional<int> SSLPointer::getSecurityLevel() {
#ifndef OPENSSL_IS_BORINGSSL
 auto ctx = SSLCtxPointer::New();
 if (!ctx) return std::nullopt;

#ifdef OPENSSL_IS_BORINGSSL
 return SSL_CTX_get_security_level(ctx.get());
#else
 auto ssl = SSLPointer::New(ctx);
 if (!ssl) return std::nullopt;

 return SSL_get_security_level(ssl);
#else
 // OPENSSL_TLS_SECURITY_LEVEL is not defined in BoringSSL
 // so assume it is the default OPENSSL_TLS_SECURITY_LEVEL value.
 return 1;
#endif // OPENSSL_IS_BORINGSSL
#endif
}

SSLCtxPointer::SSLCtxPointer(SSL_CTX* ctx) : ctx_(ctx) {}
Expand Down

18 changes: 5 additions & 13 deletions
deps/ncrypto/ncrypto.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1231,9 +1231,9 @@ class DHPointer final {
 UNABLE_TO_CHECK_GENERATOR = 0x04,
 NOT_SUITABLE_GENERATOR = 0x08,
 Q_NOT_PRIME = 0x10,
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define the DH_CHECK_INVALID_[Q or J]_VALUE
 INVALID_Q = 0x20,
#ifndef OPENSSL_IS_BORINGSSL
 // BoringSSL does not define DH_CHECK_INVALID_J_VALUE.
 INVALID_J = 0x40,
Comment thread
panva marked this conversation as resolved.

 MODULUS_TOO_SMALL = 0x80,
 MODULUS_TOO_LARGE = 0x100,
Expand All@@ -1244,14 +1244,9 @@ class DHPointer final {

 enum class CheckPublicKeyResult {
 NONE,
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define DH_R_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
 TOO_SMALL = DH_R_CHECK_PUBKEY_TOO_SMALL,
 TOO_LARGE = DH_R_CHECK_PUBKEY_TOO_LARGE,
 INVALID = DH_R_CHECK_PUBKEY_INVALID,
#else
 INVALID = DH_R_INVALID_PUBKEY,
#endif
 TOO_SMALL,
 TOO_LARGE,
 INVALID,
 CHECK_FAILED = 512,
 };
 // Check to see if the given public key is suitable for this DH instance.
Expand DownExpand Up@@ -1346,9 +1341,6 @@ class SSLPointer final {
 bool setSession(const SSLSessionPointer& session);
 bool setSniContext(const SSLCtxPointer& ctx) const;

 const char* getClientHelloAlpn() const;
 const char* getClientHelloServerName() const;

 std::optional<const std::string_view> getServerName() const;
 X509View getCertificate() const;
 EVPKeyPointer getPeerTempKey() const;
Expand Down

2 changes: 0 additions & 2 deletions
src/crypto/crypto_dh.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -319,12 +319,10 @@ void ComputeSecret(const FunctionCallbackInfo<Value>& args) {
 case DHPointer::CheckPublicKeyResult::CHECK_FAILED:
 return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env,
 "Unspecified validation error");
#ifndef OPENSSL_IS_BORINGSSL
 case DHPointer::CheckPublicKeyResult::TOO_SMALL:
 return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too small");
 case DHPointer::CheckPublicKeyResult::TOO_LARGE:
 return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too large");
#endif
 case DHPointer::CheckPublicKeyResult::INVALID:
 return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env, "Supplied key is invalid");
 case DHPointer::CheckPublicKeyResult::NONE:
Expand Down

12 changes: 0 additions & 12 deletions
src/crypto/crypto_rsa.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,18 +137,6 @@ Maybe<void> RsaKeyGenTraits::AdditionalConfig(
 params->params.modulus_bits = args[*offset + 1].As<Uint32>()->Value();
 params->params.exponent = args[*offset + 2].As<Uint32>()->Value();

#ifdef OPENSSL_IS_BORINGSSL
 // BoringSSL hangs indefinitely generating an RSA key with e=1, and for
 // other invalid exponents (e=0, even values) reports the misleading error
 // RSA_R_TOO_MANY_ITERATIONS only after running the full keygen loop. Reject
 // those up-front with a clear error. The constraint here (odd integer >= 3)
 // matches BoringSSL's own rsa_check_public_key validation.
 if (params->params.exponent < 3 || (params->params.exponent & 1) == 0) {
 THROW_ERR_OUT_OF_RANGE(env, "publicExponent is invalid");
 return Nothing<void>();
 }
#endif

 *offset += 3;

 if (params->params.variant == kKeyVariantRSA_PSS) {
Expand Down

13 changes: 5 additions & 8 deletions
test/common/boringssl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,12 +137,9 @@ function testRenegotiationUnsupported() {
}

/**
 * OpenSSL exposes the negotiated ephemeral key type, name, and size for TLS
 * clients. With BoringSSL the same ECDHE TLS 1.2 handshake succeeds, but
 * getEphemeralKeyInfo() returns null on the server side and an object whose
 * fields are undefined on the client side.
 * BoringSSL exposes the negotiated TLS group but not the ephemeral key size.
 */
function testEphemeralKeyInfoUnsupported() {
function testEphemeralKeyInfo() {
 const server = tls.createServer({
 key: fixtures.readKey('agent2-key.pem'),
 cert: fixtures.readKey('agent2-cert.pem'),
Expand All@@ -161,8 +158,8 @@ function testEphemeralKeyInfoUnsupported() {
 maxVersion: 'TLSv1.2',
 }, common.mustCall(() => {
 assert.deepStrictEqual(client.getEphemeralKeyInfo(), {
 type: undefined,
 name: undefined,
 type: 'TLSGroup',
 name: 'prime256v1',
 size: undefined,
 });
 server.close();
Expand DownExpand Up@@ -337,7 +334,7 @@ module.exports = {
 assertMultiKeyUnsupported,
 assertNoCipherMatch,
 assertOpenSSLSecurityLevelsUnsupported,
testEphemeralKeyInfoUnsupported,
testEphemeralKeyInfo,
 testLegacyProtocolUnsupported,
 testMultiPfxSelectionDifference,
 testPskTls13Unsupported,
Expand Down

50 changes: 25 additions & 25 deletions
test/parallel/test-crypto-dh-curves.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,33 +35,33 @@ if (!process.features.openssl_is_boringssl) {
 assert.strictEqual(
 crypto.createDiffieHellman(notSafePrime, Buffer.from([2])).verifyError,
 DH_CHECK_P_NOT_SAFE_PRIME);

 const group = crypto.getDiffieHellman('modp14');
 const alice = crypto.createDiffieHellman(
 group.getPrime(), group.getGenerator());
 alice.generateKeys();
 const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
 assert.throws(
 () => alice.computeSecret(Buffer.from([1])),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too small'
 });
 assert.throws(
 () => alice.computeSecret(group.getPrime()),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
 assert.throws(
 () => alice.computeSecret(
 Buffer.from((groupPrime - 1n).toString(16), 'hex')),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
}

const group = crypto.getDiffieHellman('modp14');
const alice = crypto.createDiffieHellman(
 group.getPrime(), group.getGenerator());
alice.generateKeys();
const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
assert.throws(
 () => alice.computeSecret(Buffer.from([1])),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too small'
 });
assert.throws(
 () => alice.computeSecret(group.getPrime()),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
assert.throws(
 () => alice.computeSecret(
 Buffer.from((groupPrime - 1n).toString(16), 'hex')),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });

// Confirm DH_check() results are exposed for optional examination.
const bad_dh = process.features.openssl_is_boringssl ?
 crypto.createDiffieHellman('abcd', 'hex', 0) :
Expand Down

4 changes: 1 addition & 3 deletions
test/parallel/test-crypto-dh.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ const {
 {
 assert.throws(() => {
 dh3.computeSecret('');
 }, { message: process.features.openssl_is_boringssl ?
 'Supplied key is invalid' :
 'Supplied key is too small' });
 }, { message: 'Supplied key is too small' });
 }
}

Expand Down

31 changes: 13 additions & 18 deletions
test/parallel/test-crypto-keygen.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,25 +376,20 @@ const isBoringSSL = process.features.openssl_is_boringssl;
 }

 // Test invalid exponents. (caught by OpenSSL)
 let invalidExponentError = /bad e value/;
 if (isBoringSSL) {
 invalidExponentError = /BAD_E_VALUE/;
 } else if (hasOpenSSL3) {
 invalidExponentError = /exponent/;
 }
 for (const publicExponent of [1, 1 + 0x10001]) {
 if (isBoringSSL) {
 assert.throws(() => generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustNotCall()), {
 name: 'RangeError',
 code: 'ERR_OUT_OF_RANGE',
 message: 'publicExponent is invalid',
 });
 } else {
 generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustCall((err) => {
 assert.strictEqual(err.name, 'Error');
 assert.match(err.message, hasOpenSSL3 ? /exponent/ : /bad e value/);
 }));
 }
 generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustCall((err) => {
 assert.strictEqual(err.name, 'Error');
 assert.match(err.message, invalidExponentError);
 }));
 }
}

Expand Down

6 changes: 5 additions & 1 deletion
test/parallel/test-crypto-sec-level.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,8 @@ const assert = require('assert');
// This test simply validates that we can get some value for the secLevel
// when needed by tests.
const secLevel = require('internal/crypto/util').getOpenSSLSecLevel();
assert.ok(secLevel >= 0 && secLevel <= 5);
if (process.features.openssl_is_boringssl) {
 assert.strictEqual(secLevel, 0);
} else {
 assert.ok(secLevel >= 0 && secLevel <= 5);
}
Loading
Loading

, '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
crypto: remove obsolete BoringSSL shims and use available APIs#65423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

panva
wants to merge
3
commits into

from

 Closed


crypto: remove obsolete BoringSSL shims and use available APIs
#65423
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
20c21a5

crypto: remove obsolete BoringSSL shims


panva Aug 20, 2026
932b0fc

crypto: use available BoringSSL APIs


panva Aug 20, 2026
60d2e08

fixup! crypto: use available BoringSSL APIs


panva Aug 20, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


97 changes: 11 additions & 86 deletions
deps/ncrypto/ncrypto.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {

// ============================================================================
DataPointer DataPointer::Alloc(size_t len) {
#ifdef OPENSSL_IS_BORINGSSL
 // Boringssl does not implement OPENSSL_zalloc
 auto ptr = OPENSSL_malloc(len);
 if (ptr == nullptr) return {};
 memset(ptr, 0, len);
 return DataPointer(ptr, len);
#else
 return DataPointer(OPENSSL_zalloc(len), len);
#endif
}

DataPointer DataPointer::SecureAlloc(size_t len) {
Expand All@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
}

size_t DataPointer::GetSecureHeapUsed() {
#ifndef OPENSSL_IS_BORINGSSL
 return CRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
#else
 // BoringSSL does not have the secure heap and therefore
 // will always return 0.
 return 0;
#endif
}

DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
 size_t min) {
#ifndef OPENSSL_IS_BORINGSSL
 switch (CRYPTO_secure_malloc_init(amount, min)) {
 case 0:
 return InitSecureHeapResult::FAILED;
Expand All@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
 default:
 return InitSecureHeapResult::FAILED;
 }
#else
 // BoringSSL does not actually support the secure heap
 return InitSecureHeapResult::FAILED;
#endif
}

DataPointer DataPointer::Copy(const Buffer<const void>& buffer) {
Expand DownExpand Up@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
}

BignumPointer BignumPointer::NewSecure() {
#ifdef OPENSSL_IS_BORINGSSL
 // Boringssl does not implement BN_secure_new.
 return New();
#else
 return BignumPointer(BN_secure_new());
#endif
}

BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
Expand DownExpand Up@@ -2276,14 +2252,11 @@ DHPointer::CheckPublicKeyResult DHPointer::checkPublicKey(
 if (DH_check_pub_key(dh_.get(), pub_key.get(), &codes) != 1) {
 return DHPointer::CheckPublicKeyResult::CHECK_FAILED;
 }
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define DH_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
 if (codes & DH_CHECK_PUBKEY_TOO_SMALL) {
 return DHPointer::CheckPublicKeyResult::TOO_SMALL;
 } else if (codes & DH_CHECK_PUBKEY_TOO_LARGE) {
 return DHPointer::CheckPublicKeyResult::TOO_LARGE;
 }
#endif
 if (codes != 0) {
 return DHPointer::CheckPublicKeyResult::INVALID;
 }
Expand DownExpand Up@@ -4288,59 +4261,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
 return std::nullopt;
}

const char* SSLPointer::getClientHelloAlpn() const {
 if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
 const unsigned char* buf;
 size_t len;
 size_t rem;

 if (!SSL_client_hello_get0_ext(
 get(),
 TLSEXT_TYPE_application_layer_protocol_negotiation,
 &buf,
 &rem) ||
 rem < 2) {
 return {};
 }

 len = (buf[0] << 8) | buf[1];
 if (len + 2 != rem) return {};
 return reinterpret_cast<const char*>(buf + 3);
#else
 // Boringssl doesn't have a public API for this.
 return {};
#endif
}

const char* SSLPointer::getClientHelloServerName() const {
 if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
 const unsigned char* buf;
 size_t len;
 size_t rem;

 if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
 rem <= 2) {
 return {};
 }

 len = (*buf << 8) | *(buf + 1);
 if (len + 2 != rem) return {};
 rem = len;

 if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
 rem--;
 if (rem <= 2) return {};
 len = (*(buf + 3) << 8) | *(buf + 4);
 if (len + 2 > rem) return {};
 return reinterpret_cast<const char*>(buf + 5);
#else
 // Boringssl doesn't have a public API for this.
 return {};
#endif
}

std::optional<const std::string_view> SSLPointer::GetServerName(
 const SSL* ssl) {
 if (ssl == nullptr) return std::nullopt;
Expand DownExpand Up@@ -4386,6 +4306,13 @@ std::optional<std::string_view> SSLPointer::getNegotiatedGroup() const {
 const char* group = SSL_get0_group_name(get());
 if (group == nullptr) return std::nullopt;
 return group;
#elif defined(OPENSSL_IS_BORINGSSL)
 if (!ssl_) return std::nullopt;
 const int nid = SSL_get_negotiated_group(get());
 if (nid == NID_undef) return std::nullopt;
 const char* group = OBJ_nid2sn(nid);
 if (group == nullptr) return std::nullopt;
 return group;
#else
 return std::nullopt;
#endif
Expand All@@ -4410,19 +4337,17 @@ std::optional<std::string_view> SSLPointer::getCipherVersion() const {
}

std::optional<int> SSLPointer::getSecurityLevel() {
#ifndef OPENSSL_IS_BORINGSSL
 auto ctx = SSLCtxPointer::New();
 if (!ctx) return std::nullopt;

#ifdef OPENSSL_IS_BORINGSSL
 return SSL_CTX_get_security_level(ctx.get());
#else
 auto ssl = SSLPointer::New(ctx);
 if (!ssl) return std::nullopt;

 return SSL_get_security_level(ssl);
#else
 // OPENSSL_TLS_SECURITY_LEVEL is not defined in BoringSSL
 // so assume it is the default OPENSSL_TLS_SECURITY_LEVEL value.
 return 1;
#endif // OPENSSL_IS_BORINGSSL
#endif
}

SSLCtxPointer::SSLCtxPointer(SSL_CTX* ctx) : ctx_(ctx) {}
Expand Down

18 changes: 5 additions & 13 deletions
deps/ncrypto/ncrypto.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1231,9 +1231,9 @@ class DHPointer final {
 UNABLE_TO_CHECK_GENERATOR = 0x04,
 NOT_SUITABLE_GENERATOR = 0x08,
 Q_NOT_PRIME = 0x10,
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define the DH_CHECK_INVALID_[Q or J]_VALUE
 INVALID_Q = 0x20,
#ifndef OPENSSL_IS_BORINGSSL
 // BoringSSL does not define DH_CHECK_INVALID_J_VALUE.
 INVALID_J = 0x40,
Comment thread
panva marked this conversation as resolved.

 MODULUS_TOO_SMALL = 0x80,
 MODULUS_TOO_LARGE = 0x100,
Expand All@@ -1244,14 +1244,9 @@ class DHPointer final {

 enum class CheckPublicKeyResult {
 NONE,
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define DH_R_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
 TOO_SMALL = DH_R_CHECK_PUBKEY_TOO_SMALL,
 TOO_LARGE = DH_R_CHECK_PUBKEY_TOO_LARGE,
 INVALID = DH_R_CHECK_PUBKEY_INVALID,
#else
 INVALID = DH_R_INVALID_PUBKEY,
#endif
 TOO_SMALL,
 TOO_LARGE,
 INVALID,
 CHECK_FAILED = 512,
 };
 // Check to see if the given public key is suitable for this DH instance.
Expand DownExpand Up@@ -1346,9 +1341,6 @@ class SSLPointer final {
 bool setSession(const SSLSessionPointer& session);
 bool setSniContext(const SSLCtxPointer& ctx) const;

 const char* getClientHelloAlpn() const;
 const char* getClientHelloServerName() const;

 std::optional<const std::string_view> getServerName() const;
 X509View getCertificate() const;
 EVPKeyPointer getPeerTempKey() const;
Expand Down

2 changes: 0 additions & 2 deletions
src/crypto/crypto_dh.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -319,12 +319,10 @@ void ComputeSecret(const FunctionCallbackInfo<Value>& args) {
 case DHPointer::CheckPublicKeyResult::CHECK_FAILED:
 return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env,
 "Unspecified validation error");
#ifndef OPENSSL_IS_BORINGSSL
 case DHPointer::CheckPublicKeyResult::TOO_SMALL:
 return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too small");
 case DHPointer::CheckPublicKeyResult::TOO_LARGE:
 return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too large");
#endif
 case DHPointer::CheckPublicKeyResult::INVALID:
 return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env, "Supplied key is invalid");
 case DHPointer::CheckPublicKeyResult::NONE:
Expand Down

12 changes: 0 additions & 12 deletions
src/crypto/crypto_rsa.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,18 +137,6 @@ Maybe<void> RsaKeyGenTraits::AdditionalConfig(
 params->params.modulus_bits = args[*offset + 1].As<Uint32>()->Value();
 params->params.exponent = args[*offset + 2].As<Uint32>()->Value();

#ifdef OPENSSL_IS_BORINGSSL
 // BoringSSL hangs indefinitely generating an RSA key with e=1, and for
 // other invalid exponents (e=0, even values) reports the misleading error
 // RSA_R_TOO_MANY_ITERATIONS only after running the full keygen loop. Reject
 // those up-front with a clear error. The constraint here (odd integer >= 3)
 // matches BoringSSL's own rsa_check_public_key validation.
 if (params->params.exponent < 3 || (params->params.exponent & 1) == 0) {
 THROW_ERR_OUT_OF_RANGE(env, "publicExponent is invalid");
 return Nothing<void>();
 }
#endif

 *offset += 3;

 if (params->params.variant == kKeyVariantRSA_PSS) {
Expand Down

13 changes: 5 additions & 8 deletions
test/common/boringssl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,12 +137,9 @@ function testRenegotiationUnsupported() {
}

/**
 * OpenSSL exposes the negotiated ephemeral key type, name, and size for TLS
 * clients. With BoringSSL the same ECDHE TLS 1.2 handshake succeeds, but
 * getEphemeralKeyInfo() returns null on the server side and an object whose
 * fields are undefined on the client side.
 * BoringSSL exposes the negotiated TLS group but not the ephemeral key size.
 */
function testEphemeralKeyInfoUnsupported() {
function testEphemeralKeyInfo() {
 const server = tls.createServer({
 key: fixtures.readKey('agent2-key.pem'),
 cert: fixtures.readKey('agent2-cert.pem'),
Expand All@@ -161,8 +158,8 @@ function testEphemeralKeyInfoUnsupported() {
 maxVersion: 'TLSv1.2',
 }, common.mustCall(() => {
 assert.deepStrictEqual(client.getEphemeralKeyInfo(), {
 type: undefined,
 name: undefined,
 type: 'TLSGroup',
 name: 'prime256v1',
 size: undefined,
 });
 server.close();
Expand DownExpand Up@@ -337,7 +334,7 @@ module.exports = {
 assertMultiKeyUnsupported,
 assertNoCipherMatch,
 assertOpenSSLSecurityLevelsUnsupported,
testEphemeralKeyInfoUnsupported,
testEphemeralKeyInfo,
 testLegacyProtocolUnsupported,
 testMultiPfxSelectionDifference,
 testPskTls13Unsupported,
Expand Down

50 changes: 25 additions & 25 deletions
test/parallel/test-crypto-dh-curves.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,33 +35,33 @@ if (!process.features.openssl_is_boringssl) {
 assert.strictEqual(
 crypto.createDiffieHellman(notSafePrime, Buffer.from([2])).verifyError,
 DH_CHECK_P_NOT_SAFE_PRIME);

 const group = crypto.getDiffieHellman('modp14');
 const alice = crypto.createDiffieHellman(
 group.getPrime(), group.getGenerator());
 alice.generateKeys();
 const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
 assert.throws(
 () => alice.computeSecret(Buffer.from([1])),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too small'
 });
 assert.throws(
 () => alice.computeSecret(group.getPrime()),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
 assert.throws(
 () => alice.computeSecret(
 Buffer.from((groupPrime - 1n).toString(16), 'hex')),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
}

const group = crypto.getDiffieHellman('modp14');
const alice = crypto.createDiffieHellman(
 group.getPrime(), group.getGenerator());
alice.generateKeys();
const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
assert.throws(
 () => alice.computeSecret(Buffer.from([1])),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too small'
 });
assert.throws(
 () => alice.computeSecret(group.getPrime()),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
assert.throws(
 () => alice.computeSecret(
 Buffer.from((groupPrime - 1n).toString(16), 'hex')),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });

// Confirm DH_check() results are exposed for optional examination.
const bad_dh = process.features.openssl_is_boringssl ?
 crypto.createDiffieHellman('abcd', 'hex', 0) :
Expand Down

4 changes: 1 addition & 3 deletions
test/parallel/test-crypto-dh.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ const {
 {
 assert.throws(() => {
 dh3.computeSecret('');
 }, { message: process.features.openssl_is_boringssl ?
 'Supplied key is invalid' :
 'Supplied key is too small' });
 }, { message: 'Supplied key is too small' });
 }
}

Expand Down

31 changes: 13 additions & 18 deletions
test/parallel/test-crypto-keygen.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,25 +376,20 @@ const isBoringSSL = process.features.openssl_is_boringssl;
 }

 // Test invalid exponents. (caught by OpenSSL)
 let invalidExponentError = /bad e value/;
 if (isBoringSSL) {
 invalidExponentError = /BAD_E_VALUE/;
 } else if (hasOpenSSL3) {
 invalidExponentError = /exponent/;
 }
 for (const publicExponent of [1, 1 + 0x10001]) {
 if (isBoringSSL) {
 assert.throws(() => generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustNotCall()), {
 name: 'RangeError',
 code: 'ERR_OUT_OF_RANGE',
 message: 'publicExponent is invalid',
 });
 } else {
 generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustCall((err) => {
 assert.strictEqual(err.name, 'Error');
 assert.match(err.message, hasOpenSSL3 ? /exponent/ : /bad e value/);
 }));
 }
 generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustCall((err) => {
 assert.strictEqual(err.name, 'Error');
 assert.match(err.message, invalidExponentError);
 }));
 }
}

Expand Down

6 changes: 5 additions & 1 deletion
test/parallel/test-crypto-sec-level.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,8 @@ const assert = require('assert');
// This test simply validates that we can get some value for the secLevel
// when needed by tests.
const secLevel = require('internal/crypto/util').getOpenSSLSecLevel();
assert.ok(secLevel >= 0 && secLevel <= 5);
if (process.features.openssl_is_boringssl) {
 assert.strictEqual(secLevel, 0);
} else {
 assert.ok(secLevel >= 0 && secLevel <= 5);
}
Loading
Loading

, '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
crypto: remove obsolete BoringSSL shims and use available APIs#65423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

panva
wants to merge
3
commits into

from

 Closed


crypto: remove obsolete BoringSSL shims and use available APIs
#65423
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
20c21a5

crypto: remove obsolete BoringSSL shims


panva Aug 20, 2026
932b0fc

crypto: use available BoringSSL APIs


panva Aug 20, 2026
60d2e08

fixup! crypto: use available BoringSSL APIs


panva Aug 20, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


97 changes: 11 additions & 86 deletions
deps/ncrypto/ncrypto.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {

// ============================================================================
DataPointer DataPointer::Alloc(size_t len) {
#ifdef OPENSSL_IS_BORINGSSL
 // Boringssl does not implement OPENSSL_zalloc
 auto ptr = OPENSSL_malloc(len);
 if (ptr == nullptr) return {};
 memset(ptr, 0, len);
 return DataPointer(ptr, len);
#else
 return DataPointer(OPENSSL_zalloc(len), len);
#endif
}

DataPointer DataPointer::SecureAlloc(size_t len) {
Expand All@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
}

size_t DataPointer::GetSecureHeapUsed() {
#ifndef OPENSSL_IS_BORINGSSL
 return CRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
#else
 // BoringSSL does not have the secure heap and therefore
 // will always return 0.
 return 0;
#endif
}

DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
 size_t min) {
#ifndef OPENSSL_IS_BORINGSSL
 switch (CRYPTO_secure_malloc_init(amount, min)) {
 case 0:
 return InitSecureHeapResult::FAILED;
Expand All@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
 default:
 return InitSecureHeapResult::FAILED;
 }
#else
 // BoringSSL does not actually support the secure heap
 return InitSecureHeapResult::FAILED;
#endif
}

DataPointer DataPointer::Copy(const Buffer<const void>& buffer) {
Expand DownExpand Up@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
}

BignumPointer BignumPointer::NewSecure() {
#ifdef OPENSSL_IS_BORINGSSL
 // Boringssl does not implement BN_secure_new.
 return New();
#else
 return BignumPointer(BN_secure_new());
#endif
}

BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
Expand DownExpand Up@@ -2276,14 +2252,11 @@ DHPointer::CheckPublicKeyResult DHPointer::checkPublicKey(
 if (DH_check_pub_key(dh_.get(), pub_key.get(), &codes) != 1) {
 return DHPointer::CheckPublicKeyResult::CHECK_FAILED;
 }
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define DH_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
 if (codes & DH_CHECK_PUBKEY_TOO_SMALL) {
 return DHPointer::CheckPublicKeyResult::TOO_SMALL;
 } else if (codes & DH_CHECK_PUBKEY_TOO_LARGE) {
 return DHPointer::CheckPublicKeyResult::TOO_LARGE;
 }
#endif
 if (codes != 0) {
 return DHPointer::CheckPublicKeyResult::INVALID;
 }
Expand DownExpand Up@@ -4288,59 +4261,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
 return std::nullopt;
}

const char* SSLPointer::getClientHelloAlpn() const {
 if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
 const unsigned char* buf;
 size_t len;
 size_t rem;

 if (!SSL_client_hello_get0_ext(
 get(),
 TLSEXT_TYPE_application_layer_protocol_negotiation,
 &buf,
 &rem) ||
 rem < 2) {
 return {};
 }

 len = (buf[0] << 8) | buf[1];
 if (len + 2 != rem) return {};
 return reinterpret_cast<const char*>(buf + 3);
#else
 // Boringssl doesn't have a public API for this.
 return {};
#endif
}

const char* SSLPointer::getClientHelloServerName() const {
 if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
 const unsigned char* buf;
 size_t len;
 size_t rem;

 if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
 rem <= 2) {
 return {};
 }

 len = (*buf << 8) | *(buf + 1);
 if (len + 2 != rem) return {};
 rem = len;

 if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
 rem--;
 if (rem <= 2) return {};
 len = (*(buf + 3) << 8) | *(buf + 4);
 if (len + 2 > rem) return {};
 return reinterpret_cast<const char*>(buf + 5);
#else
 // Boringssl doesn't have a public API for this.
 return {};
#endif
}

std::optional<const std::string_view> SSLPointer::GetServerName(
 const SSL* ssl) {
 if (ssl == nullptr) return std::nullopt;
Expand DownExpand Up@@ -4386,6 +4306,13 @@ std::optional<std::string_view> SSLPointer::getNegotiatedGroup() const {
 const char* group = SSL_get0_group_name(get());
 if (group == nullptr) return std::nullopt;
 return group;
#elif defined(OPENSSL_IS_BORINGSSL)
 if (!ssl_) return std::nullopt;
 const int nid = SSL_get_negotiated_group(get());
 if (nid == NID_undef) return std::nullopt;
 const char* group = OBJ_nid2sn(nid);
 if (group == nullptr) return std::nullopt;
 return group;
#else
 return std::nullopt;
#endif
Expand All@@ -4410,19 +4337,17 @@ std::optional<std::string_view> SSLPointer::getCipherVersion() const {
}

std::optional<int> SSLPointer::getSecurityLevel() {
#ifndef OPENSSL_IS_BORINGSSL
 auto ctx = SSLCtxPointer::New();
 if (!ctx) return std::nullopt;

#ifdef OPENSSL_IS_BORINGSSL
 return SSL_CTX_get_security_level(ctx.get());
#else
 auto ssl = SSLPointer::New(ctx);
 if (!ssl) return std::nullopt;

 return SSL_get_security_level(ssl);
#else
 // OPENSSL_TLS_SECURITY_LEVEL is not defined in BoringSSL
 // so assume it is the default OPENSSL_TLS_SECURITY_LEVEL value.
 return 1;
#endif // OPENSSL_IS_BORINGSSL
#endif
}

SSLCtxPointer::SSLCtxPointer(SSL_CTX* ctx) : ctx_(ctx) {}
Expand Down

18 changes: 5 additions & 13 deletions
deps/ncrypto/ncrypto.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1231,9 +1231,9 @@ class DHPointer final {
 UNABLE_TO_CHECK_GENERATOR = 0x04,
 NOT_SUITABLE_GENERATOR = 0x08,
 Q_NOT_PRIME = 0x10,
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define the DH_CHECK_INVALID_[Q or J]_VALUE
 INVALID_Q = 0x20,
#ifndef OPENSSL_IS_BORINGSSL
 // BoringSSL does not define DH_CHECK_INVALID_J_VALUE.
 INVALID_J = 0x40,
Comment thread
panva marked this conversation as resolved.

 MODULUS_TOO_SMALL = 0x80,
 MODULUS_TOO_LARGE = 0x100,
Expand All@@ -1244,14 +1244,9 @@ class DHPointer final {

 enum class CheckPublicKeyResult {
 NONE,
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define DH_R_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
 TOO_SMALL = DH_R_CHECK_PUBKEY_TOO_SMALL,
 TOO_LARGE = DH_R_CHECK_PUBKEY_TOO_LARGE,
 INVALID = DH_R_CHECK_PUBKEY_INVALID,
#else
 INVALID = DH_R_INVALID_PUBKEY,
#endif
 TOO_SMALL,
 TOO_LARGE,
 INVALID,
 CHECK_FAILED = 512,
 };
 // Check to see if the given public key is suitable for this DH instance.
Expand DownExpand Up@@ -1346,9 +1341,6 @@ class SSLPointer final {
 bool setSession(const SSLSessionPointer& session);
 bool setSniContext(const SSLCtxPointer& ctx) const;

 const char* getClientHelloAlpn() const;
 const char* getClientHelloServerName() const;

 std::optional<const std::string_view> getServerName() const;
 X509View getCertificate() const;
 EVPKeyPointer getPeerTempKey() const;
Expand Down

2 changes: 0 additions & 2 deletions
src/crypto/crypto_dh.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -319,12 +319,10 @@ void ComputeSecret(const FunctionCallbackInfo<Value>& args) {
 case DHPointer::CheckPublicKeyResult::CHECK_FAILED:
 return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env,
 "Unspecified validation error");
#ifndef OPENSSL_IS_BORINGSSL
 case DHPointer::CheckPublicKeyResult::TOO_SMALL:
 return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too small");
 case DHPointer::CheckPublicKeyResult::TOO_LARGE:
 return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too large");
#endif
 case DHPointer::CheckPublicKeyResult::INVALID:
 return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env, "Supplied key is invalid");
 case DHPointer::CheckPublicKeyResult::NONE:
Expand Down

12 changes: 0 additions & 12 deletions
src/crypto/crypto_rsa.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,18 +137,6 @@ Maybe<void> RsaKeyGenTraits::AdditionalConfig(
 params->params.modulus_bits = args[*offset + 1].As<Uint32>()->Value();
 params->params.exponent = args[*offset + 2].As<Uint32>()->Value();

#ifdef OPENSSL_IS_BORINGSSL
 // BoringSSL hangs indefinitely generating an RSA key with e=1, and for
 // other invalid exponents (e=0, even values) reports the misleading error
 // RSA_R_TOO_MANY_ITERATIONS only after running the full keygen loop. Reject
 // those up-front with a clear error. The constraint here (odd integer >= 3)
 // matches BoringSSL's own rsa_check_public_key validation.
 if (params->params.exponent < 3 || (params->params.exponent & 1) == 0) {
 THROW_ERR_OUT_OF_RANGE(env, "publicExponent is invalid");
 return Nothing<void>();
 }
#endif

 *offset += 3;

 if (params->params.variant == kKeyVariantRSA_PSS) {
Expand Down

13 changes: 5 additions & 8 deletions
test/common/boringssl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,12 +137,9 @@ function testRenegotiationUnsupported() {
}

/**
 * OpenSSL exposes the negotiated ephemeral key type, name, and size for TLS
 * clients. With BoringSSL the same ECDHE TLS 1.2 handshake succeeds, but
 * getEphemeralKeyInfo() returns null on the server side and an object whose
 * fields are undefined on the client side.
 * BoringSSL exposes the negotiated TLS group but not the ephemeral key size.
 */
function testEphemeralKeyInfoUnsupported() {
function testEphemeralKeyInfo() {
 const server = tls.createServer({
 key: fixtures.readKey('agent2-key.pem'),
 cert: fixtures.readKey('agent2-cert.pem'),
Expand All@@ -161,8 +158,8 @@ function testEphemeralKeyInfoUnsupported() {
 maxVersion: 'TLSv1.2',
 }, common.mustCall(() => {
 assert.deepStrictEqual(client.getEphemeralKeyInfo(), {
 type: undefined,
 name: undefined,
 type: 'TLSGroup',
 name: 'prime256v1',
 size: undefined,
 });
 server.close();
Expand DownExpand Up@@ -337,7 +334,7 @@ module.exports = {
 assertMultiKeyUnsupported,
 assertNoCipherMatch,
 assertOpenSSLSecurityLevelsUnsupported,
testEphemeralKeyInfoUnsupported,
testEphemeralKeyInfo,
 testLegacyProtocolUnsupported,
 testMultiPfxSelectionDifference,
 testPskTls13Unsupported,
Expand Down

50 changes: 25 additions & 25 deletions
test/parallel/test-crypto-dh-curves.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,33 +35,33 @@ if (!process.features.openssl_is_boringssl) {
 assert.strictEqual(
 crypto.createDiffieHellman(notSafePrime, Buffer.from([2])).verifyError,
 DH_CHECK_P_NOT_SAFE_PRIME);

 const group = crypto.getDiffieHellman('modp14');
 const alice = crypto.createDiffieHellman(
 group.getPrime(), group.getGenerator());
 alice.generateKeys();
 const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
 assert.throws(
 () => alice.computeSecret(Buffer.from([1])),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too small'
 });
 assert.throws(
 () => alice.computeSecret(group.getPrime()),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
 assert.throws(
 () => alice.computeSecret(
 Buffer.from((groupPrime - 1n).toString(16), 'hex')),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
}

const group = crypto.getDiffieHellman('modp14');
const alice = crypto.createDiffieHellman(
 group.getPrime(), group.getGenerator());
alice.generateKeys();
const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
assert.throws(
 () => alice.computeSecret(Buffer.from([1])),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too small'
 });
assert.throws(
 () => alice.computeSecret(group.getPrime()),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
assert.throws(
 () => alice.computeSecret(
 Buffer.from((groupPrime - 1n).toString(16), 'hex')),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });

// Confirm DH_check() results are exposed for optional examination.
const bad_dh = process.features.openssl_is_boringssl ?
 crypto.createDiffieHellman('abcd', 'hex', 0) :
Expand Down

4 changes: 1 addition & 3 deletions
test/parallel/test-crypto-dh.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ const {
 {
 assert.throws(() => {
 dh3.computeSecret('');
 }, { message: process.features.openssl_is_boringssl ?
 'Supplied key is invalid' :
 'Supplied key is too small' });
 }, { message: 'Supplied key is too small' });
 }
}

Expand Down

31 changes: 13 additions & 18 deletions
test/parallel/test-crypto-keygen.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,25 +376,20 @@ const isBoringSSL = process.features.openssl_is_boringssl;
 }

 // Test invalid exponents. (caught by OpenSSL)
 let invalidExponentError = /bad e value/;
 if (isBoringSSL) {
 invalidExponentError = /BAD_E_VALUE/;
 } else if (hasOpenSSL3) {
 invalidExponentError = /exponent/;
 }
 for (const publicExponent of [1, 1 + 0x10001]) {
 if (isBoringSSL) {
 assert.throws(() => generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustNotCall()), {
 name: 'RangeError',
 code: 'ERR_OUT_OF_RANGE',
 message: 'publicExponent is invalid',
 });
 } else {
 generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustCall((err) => {
 assert.strictEqual(err.name, 'Error');
 assert.match(err.message, hasOpenSSL3 ? /exponent/ : /bad e value/);
 }));
 }
 generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustCall((err) => {
 assert.strictEqual(err.name, 'Error');
 assert.match(err.message, invalidExponentError);
 }));
 }
}

Expand Down

6 changes: 5 additions & 1 deletion
test/parallel/test-crypto-sec-level.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,8 @@ const assert = require('assert');
// This test simply validates that we can get some value for the secLevel
// when needed by tests.
const secLevel = require('internal/crypto/util').getOpenSSLSecLevel();
assert.ok(secLevel >= 0 && secLevel <= 5);
if (process.features.openssl_is_boringssl) {
 assert.strictEqual(secLevel, 0);
} else {
 assert.ok(secLevel >= 0 && secLevel <= 5);
}
Loading
Loading

, '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
crypto: remove obsolete BoringSSL shims and use available APIs#65423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

panva
wants to merge
3
commits into

from

 Closed


crypto: remove obsolete BoringSSL shims and use available APIs
#65423
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
20c21a5

crypto: remove obsolete BoringSSL shims


panva Aug 20, 2026
932b0fc

crypto: use available BoringSSL APIs


panva Aug 20, 2026
60d2e08

fixup! crypto: use available BoringSSL APIs


panva Aug 20, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


97 changes: 11 additions & 86 deletions
deps/ncrypto/ncrypto.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {

// ============================================================================
DataPointer DataPointer::Alloc(size_t len) {
#ifdef OPENSSL_IS_BORINGSSL
 // Boringssl does not implement OPENSSL_zalloc
 auto ptr = OPENSSL_malloc(len);
 if (ptr == nullptr) return {};
 memset(ptr, 0, len);
 return DataPointer(ptr, len);
#else
 return DataPointer(OPENSSL_zalloc(len), len);
#endif
}

DataPointer DataPointer::SecureAlloc(size_t len) {
Expand All@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
}

size_t DataPointer::GetSecureHeapUsed() {
#ifndef OPENSSL_IS_BORINGSSL
 return CRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
#else
 // BoringSSL does not have the secure heap and therefore
 // will always return 0.
 return 0;
#endif
}

DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
 size_t min) {
#ifndef OPENSSL_IS_BORINGSSL
 switch (CRYPTO_secure_malloc_init(amount, min)) {
 case 0:
 return InitSecureHeapResult::FAILED;
Expand All@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
 default:
 return InitSecureHeapResult::FAILED;
 }
#else
 // BoringSSL does not actually support the secure heap
 return InitSecureHeapResult::FAILED;
#endif
}

DataPointer DataPointer::Copy(const Buffer<const void>& buffer) {
Expand DownExpand Up@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
}

BignumPointer BignumPointer::NewSecure() {
#ifdef OPENSSL_IS_BORINGSSL
 // Boringssl does not implement BN_secure_new.
 return New();
#else
 return BignumPointer(BN_secure_new());
#endif
}

BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
Expand DownExpand Up@@ -2276,14 +2252,11 @@ DHPointer::CheckPublicKeyResult DHPointer::checkPublicKey(
 if (DH_check_pub_key(dh_.get(), pub_key.get(), &codes) != 1) {
 return DHPointer::CheckPublicKeyResult::CHECK_FAILED;
 }
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define DH_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
 if (codes & DH_CHECK_PUBKEY_TOO_SMALL) {
 return DHPointer::CheckPublicKeyResult::TOO_SMALL;
 } else if (codes & DH_CHECK_PUBKEY_TOO_LARGE) {
 return DHPointer::CheckPublicKeyResult::TOO_LARGE;
 }
#endif
 if (codes != 0) {
 return DHPointer::CheckPublicKeyResult::INVALID;
 }
Expand DownExpand Up@@ -4288,59 +4261,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
 return std::nullopt;
}

const char* SSLPointer::getClientHelloAlpn() const {
 if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
 const unsigned char* buf;
 size_t len;
 size_t rem;

 if (!SSL_client_hello_get0_ext(
 get(),
 TLSEXT_TYPE_application_layer_protocol_negotiation,
 &buf,
 &rem) ||
 rem < 2) {
 return {};
 }

 len = (buf[0] << 8) | buf[1];
 if (len + 2 != rem) return {};
 return reinterpret_cast<const char*>(buf + 3);
#else
 // Boringssl doesn't have a public API for this.
 return {};
#endif
}

const char* SSLPointer::getClientHelloServerName() const {
 if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
 const unsigned char* buf;
 size_t len;
 size_t rem;

 if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
 rem <= 2) {
 return {};
 }

 len = (*buf << 8) | *(buf + 1);
 if (len + 2 != rem) return {};
 rem = len;

 if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
 rem--;
 if (rem <= 2) return {};
 len = (*(buf + 3) << 8) | *(buf + 4);
 if (len + 2 > rem) return {};
 return reinterpret_cast<const char*>(buf + 5);
#else
 // Boringssl doesn't have a public API for this.
 return {};
#endif
}

std::optional<const std::string_view> SSLPointer::GetServerName(
 const SSL* ssl) {
 if (ssl == nullptr) return std::nullopt;
Expand DownExpand Up@@ -4386,6 +4306,13 @@ std::optional<std::string_view> SSLPointer::getNegotiatedGroup() const {
 const char* group = SSL_get0_group_name(get());
 if (group == nullptr) return std::nullopt;
 return group;
#elif defined(OPENSSL_IS_BORINGSSL)
 if (!ssl_) return std::nullopt;
 const int nid = SSL_get_negotiated_group(get());
 if (nid == NID_undef) return std::nullopt;
 const char* group = OBJ_nid2sn(nid);
 if (group == nullptr) return std::nullopt;
 return group;
#else
 return std::nullopt;
#endif
Expand All@@ -4410,19 +4337,17 @@ std::optional<std::string_view> SSLPointer::getCipherVersion() const {
}

std::optional<int> SSLPointer::getSecurityLevel() {
#ifndef OPENSSL_IS_BORINGSSL
 auto ctx = SSLCtxPointer::New();
 if (!ctx) return std::nullopt;

#ifdef OPENSSL_IS_BORINGSSL
 return SSL_CTX_get_security_level(ctx.get());
#else
 auto ssl = SSLPointer::New(ctx);
 if (!ssl) return std::nullopt;

 return SSL_get_security_level(ssl);
#else
 // OPENSSL_TLS_SECURITY_LEVEL is not defined in BoringSSL
 // so assume it is the default OPENSSL_TLS_SECURITY_LEVEL value.
 return 1;
#endif // OPENSSL_IS_BORINGSSL
#endif
}

SSLCtxPointer::SSLCtxPointer(SSL_CTX* ctx) : ctx_(ctx) {}
Expand Down

18 changes: 5 additions & 13 deletions
deps/ncrypto/ncrypto.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1231,9 +1231,9 @@ class DHPointer final {
 UNABLE_TO_CHECK_GENERATOR = 0x04,
 NOT_SUITABLE_GENERATOR = 0x08,
 Q_NOT_PRIME = 0x10,
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define the DH_CHECK_INVALID_[Q or J]_VALUE
 INVALID_Q = 0x20,
#ifndef OPENSSL_IS_BORINGSSL
 // BoringSSL does not define DH_CHECK_INVALID_J_VALUE.
 INVALID_J = 0x40,
Comment thread
panva marked this conversation as resolved.

 MODULUS_TOO_SMALL = 0x80,
 MODULUS_TOO_LARGE = 0x100,
Expand All@@ -1244,14 +1244,9 @@ class DHPointer final {

 enum class CheckPublicKeyResult {
 NONE,
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define DH_R_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
 TOO_SMALL = DH_R_CHECK_PUBKEY_TOO_SMALL,
 TOO_LARGE = DH_R_CHECK_PUBKEY_TOO_LARGE,
 INVALID = DH_R_CHECK_PUBKEY_INVALID,
#else
 INVALID = DH_R_INVALID_PUBKEY,
#endif
 TOO_SMALL,
 TOO_LARGE,
 INVALID,
 CHECK_FAILED = 512,
 };
 // Check to see if the given public key is suitable for this DH instance.
Expand DownExpand Up@@ -1346,9 +1341,6 @@ class SSLPointer final {
 bool setSession(const SSLSessionPointer& session);
 bool setSniContext(const SSLCtxPointer& ctx) const;

 const char* getClientHelloAlpn() const;
 const char* getClientHelloServerName() const;

 std::optional<const std::string_view> getServerName() const;
 X509View getCertificate() const;
 EVPKeyPointer getPeerTempKey() const;
Expand Down

2 changes: 0 additions & 2 deletions
src/crypto/crypto_dh.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -319,12 +319,10 @@ void ComputeSecret(const FunctionCallbackInfo<Value>& args) {
 case DHPointer::CheckPublicKeyResult::CHECK_FAILED:
 return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env,
 "Unspecified validation error");
#ifndef OPENSSL_IS_BORINGSSL
 case DHPointer::CheckPublicKeyResult::TOO_SMALL:
 return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too small");
 case DHPointer::CheckPublicKeyResult::TOO_LARGE:
 return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too large");
#endif
 case DHPointer::CheckPublicKeyResult::INVALID:
 return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env, "Supplied key is invalid");
 case DHPointer::CheckPublicKeyResult::NONE:
Expand Down

12 changes: 0 additions & 12 deletions
src/crypto/crypto_rsa.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,18 +137,6 @@ Maybe<void> RsaKeyGenTraits::AdditionalConfig(
 params->params.modulus_bits = args[*offset + 1].As<Uint32>()->Value();
 params->params.exponent = args[*offset + 2].As<Uint32>()->Value();

#ifdef OPENSSL_IS_BORINGSSL
 // BoringSSL hangs indefinitely generating an RSA key with e=1, and for
 // other invalid exponents (e=0, even values) reports the misleading error
 // RSA_R_TOO_MANY_ITERATIONS only after running the full keygen loop. Reject
 // those up-front with a clear error. The constraint here (odd integer >= 3)
 // matches BoringSSL's own rsa_check_public_key validation.
 if (params->params.exponent < 3 || (params->params.exponent & 1) == 0) {
 THROW_ERR_OUT_OF_RANGE(env, "publicExponent is invalid");
 return Nothing<void>();
 }
#endif

 *offset += 3;

 if (params->params.variant == kKeyVariantRSA_PSS) {
Expand Down

13 changes: 5 additions & 8 deletions
test/common/boringssl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,12 +137,9 @@ function testRenegotiationUnsupported() {
}

/**
 * OpenSSL exposes the negotiated ephemeral key type, name, and size for TLS
 * clients. With BoringSSL the same ECDHE TLS 1.2 handshake succeeds, but
 * getEphemeralKeyInfo() returns null on the server side and an object whose
 * fields are undefined on the client side.
 * BoringSSL exposes the negotiated TLS group but not the ephemeral key size.
 */
function testEphemeralKeyInfoUnsupported() {
function testEphemeralKeyInfo() {
 const server = tls.createServer({
 key: fixtures.readKey('agent2-key.pem'),
 cert: fixtures.readKey('agent2-cert.pem'),
Expand All@@ -161,8 +158,8 @@ function testEphemeralKeyInfoUnsupported() {
 maxVersion: 'TLSv1.2',
 }, common.mustCall(() => {
 assert.deepStrictEqual(client.getEphemeralKeyInfo(), {
 type: undefined,
 name: undefined,
 type: 'TLSGroup',
 name: 'prime256v1',
 size: undefined,
 });
 server.close();
Expand DownExpand Up@@ -337,7 +334,7 @@ module.exports = {
 assertMultiKeyUnsupported,
 assertNoCipherMatch,
 assertOpenSSLSecurityLevelsUnsupported,
testEphemeralKeyInfoUnsupported,
testEphemeralKeyInfo,
 testLegacyProtocolUnsupported,
 testMultiPfxSelectionDifference,
 testPskTls13Unsupported,
Expand Down

50 changes: 25 additions & 25 deletions
test/parallel/test-crypto-dh-curves.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,33 +35,33 @@ if (!process.features.openssl_is_boringssl) {
 assert.strictEqual(
 crypto.createDiffieHellman(notSafePrime, Buffer.from([2])).verifyError,
 DH_CHECK_P_NOT_SAFE_PRIME);

 const group = crypto.getDiffieHellman('modp14');
 const alice = crypto.createDiffieHellman(
 group.getPrime(), group.getGenerator());
 alice.generateKeys();
 const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
 assert.throws(
 () => alice.computeSecret(Buffer.from([1])),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too small'
 });
 assert.throws(
 () => alice.computeSecret(group.getPrime()),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
 assert.throws(
 () => alice.computeSecret(
 Buffer.from((groupPrime - 1n).toString(16), 'hex')),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
}

const group = crypto.getDiffieHellman('modp14');
const alice = crypto.createDiffieHellman(
 group.getPrime(), group.getGenerator());
alice.generateKeys();
const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
assert.throws(
 () => alice.computeSecret(Buffer.from([1])),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too small'
 });
assert.throws(
 () => alice.computeSecret(group.getPrime()),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
assert.throws(
 () => alice.computeSecret(
 Buffer.from((groupPrime - 1n).toString(16), 'hex')),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });

// Confirm DH_check() results are exposed for optional examination.
const bad_dh = process.features.openssl_is_boringssl ?
 crypto.createDiffieHellman('abcd', 'hex', 0) :
Expand Down

4 changes: 1 addition & 3 deletions
test/parallel/test-crypto-dh.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ const {
 {
 assert.throws(() => {
 dh3.computeSecret('');
 }, { message: process.features.openssl_is_boringssl ?
 'Supplied key is invalid' :
 'Supplied key is too small' });
 }, { message: 'Supplied key is too small' });
 }
}

Expand Down

31 changes: 13 additions & 18 deletions
test/parallel/test-crypto-keygen.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,25 +376,20 @@ const isBoringSSL = process.features.openssl_is_boringssl;
 }

 // Test invalid exponents. (caught by OpenSSL)
 let invalidExponentError = /bad e value/;
 if (isBoringSSL) {
 invalidExponentError = /BAD_E_VALUE/;
 } else if (hasOpenSSL3) {
 invalidExponentError = /exponent/;
 }
 for (const publicExponent of [1, 1 + 0x10001]) {
 if (isBoringSSL) {
 assert.throws(() => generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustNotCall()), {
 name: 'RangeError',
 code: 'ERR_OUT_OF_RANGE',
 message: 'publicExponent is invalid',
 });
 } else {
 generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustCall((err) => {
 assert.strictEqual(err.name, 'Error');
 assert.match(err.message, hasOpenSSL3 ? /exponent/ : /bad e value/);
 }));
 }
 generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustCall((err) => {
 assert.strictEqual(err.name, 'Error');
 assert.match(err.message, invalidExponentError);
 }));
 }
}

Expand Down

6 changes: 5 additions & 1 deletion
test/parallel/test-crypto-sec-level.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,8 @@ const assert = require('assert');
// This test simply validates that we can get some value for the secLevel
// when needed by tests.
const secLevel = require('internal/crypto/util').getOpenSSLSecLevel();
assert.ok(secLevel >= 0 && secLevel <= 5);
if (process.features.openssl_is_boringssl) {
 assert.strictEqual(secLevel, 0);
} else {
 assert.ok(secLevel >= 0 && secLevel <= 5);
}
Loading
Loading

, '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
crypto: remove obsolete BoringSSL shims and use available APIs#65423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

panva
wants to merge
3
commits into

from

 Closed


crypto: remove obsolete BoringSSL shims and use available APIs
#65423
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
20c21a5

crypto: remove obsolete BoringSSL shims


panva Aug 20, 2026
932b0fc

crypto: use available BoringSSL APIs


panva Aug 20, 2026
60d2e08

fixup! crypto: use available BoringSSL APIs


panva Aug 20, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


97 changes: 11 additions & 86 deletions
deps/ncrypto/ncrypto.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {

// ============================================================================
DataPointer DataPointer::Alloc(size_t len) {
#ifdef OPENSSL_IS_BORINGSSL
 // Boringssl does not implement OPENSSL_zalloc
 auto ptr = OPENSSL_malloc(len);
 if (ptr == nullptr) return {};
 memset(ptr, 0, len);
 return DataPointer(ptr, len);
#else
 return DataPointer(OPENSSL_zalloc(len), len);
#endif
}

DataPointer DataPointer::SecureAlloc(size_t len) {
Expand All@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
}

size_t DataPointer::GetSecureHeapUsed() {
#ifndef OPENSSL_IS_BORINGSSL
 return CRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
#else
 // BoringSSL does not have the secure heap and therefore
 // will always return 0.
 return 0;
#endif
}

DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
 size_t min) {
#ifndef OPENSSL_IS_BORINGSSL
 switch (CRYPTO_secure_malloc_init(amount, min)) {
 case 0:
 return InitSecureHeapResult::FAILED;
Expand All@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
 default:
 return InitSecureHeapResult::FAILED;
 }
#else
 // BoringSSL does not actually support the secure heap
 return InitSecureHeapResult::FAILED;
#endif
}

DataPointer DataPointer::Copy(const Buffer<const void>& buffer) {
Expand DownExpand Up@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
}

BignumPointer BignumPointer::NewSecure() {
#ifdef OPENSSL_IS_BORINGSSL
 // Boringssl does not implement BN_secure_new.
 return New();
#else
 return BignumPointer(BN_secure_new());
#endif
}

BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
Expand DownExpand Up@@ -2276,14 +2252,11 @@ DHPointer::CheckPublicKeyResult DHPointer::checkPublicKey(
 if (DH_check_pub_key(dh_.get(), pub_key.get(), &codes) != 1) {
 return DHPointer::CheckPublicKeyResult::CHECK_FAILED;
 }
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define DH_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
 if (codes & DH_CHECK_PUBKEY_TOO_SMALL) {
 return DHPointer::CheckPublicKeyResult::TOO_SMALL;
 } else if (codes & DH_CHECK_PUBKEY_TOO_LARGE) {
 return DHPointer::CheckPublicKeyResult::TOO_LARGE;
 }
#endif
 if (codes != 0) {
 return DHPointer::CheckPublicKeyResult::INVALID;
 }
Expand DownExpand Up@@ -4288,59 +4261,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
 return std::nullopt;
}

const char* SSLPointer::getClientHelloAlpn() const {
 if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
 const unsigned char* buf;
 size_t len;
 size_t rem;

 if (!SSL_client_hello_get0_ext(
 get(),
 TLSEXT_TYPE_application_layer_protocol_negotiation,
 &buf,
 &rem) ||
 rem < 2) {
 return {};
 }

 len = (buf[0] << 8) | buf[1];
 if (len + 2 != rem) return {};
 return reinterpret_cast<const char*>(buf + 3);
#else
 // Boringssl doesn't have a public API for this.
 return {};
#endif
}

const char* SSLPointer::getClientHelloServerName() const {
 if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
 const unsigned char* buf;
 size_t len;
 size_t rem;

 if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
 rem <= 2) {
 return {};
 }

 len = (*buf << 8) | *(buf + 1);
 if (len + 2 != rem) return {};
 rem = len;

 if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
 rem--;
 if (rem <= 2) return {};
 len = (*(buf + 3) << 8) | *(buf + 4);
 if (len + 2 > rem) return {};
 return reinterpret_cast<const char*>(buf + 5);
#else
 // Boringssl doesn't have a public API for this.
 return {};
#endif
}

std::optional<const std::string_view> SSLPointer::GetServerName(
 const SSL* ssl) {
 if (ssl == nullptr) return std::nullopt;
Expand DownExpand Up@@ -4386,6 +4306,13 @@ std::optional<std::string_view> SSLPointer::getNegotiatedGroup() const {
 const char* group = SSL_get0_group_name(get());
 if (group == nullptr) return std::nullopt;
 return group;
#elif defined(OPENSSL_IS_BORINGSSL)
 if (!ssl_) return std::nullopt;
 const int nid = SSL_get_negotiated_group(get());
 if (nid == NID_undef) return std::nullopt;
 const char* group = OBJ_nid2sn(nid);
 if (group == nullptr) return std::nullopt;
 return group;
#else
 return std::nullopt;
#endif
Expand All@@ -4410,19 +4337,17 @@ std::optional<std::string_view> SSLPointer::getCipherVersion() const {
}

std::optional<int> SSLPointer::getSecurityLevel() {
#ifndef OPENSSL_IS_BORINGSSL
 auto ctx = SSLCtxPointer::New();
 if (!ctx) return std::nullopt;

#ifdef OPENSSL_IS_BORINGSSL
 return SSL_CTX_get_security_level(ctx.get());
#else
 auto ssl = SSLPointer::New(ctx);
 if (!ssl) return std::nullopt;

 return SSL_get_security_level(ssl);
#else
 // OPENSSL_TLS_SECURITY_LEVEL is not defined in BoringSSL
 // so assume it is the default OPENSSL_TLS_SECURITY_LEVEL value.
 return 1;
#endif // OPENSSL_IS_BORINGSSL
#endif
}

SSLCtxPointer::SSLCtxPointer(SSL_CTX* ctx) : ctx_(ctx) {}
Expand Down

18 changes: 5 additions & 13 deletions
deps/ncrypto/ncrypto.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1231,9 +1231,9 @@ class DHPointer final {
 UNABLE_TO_CHECK_GENERATOR = 0x04,
 NOT_SUITABLE_GENERATOR = 0x08,
 Q_NOT_PRIME = 0x10,
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define the DH_CHECK_INVALID_[Q or J]_VALUE
 INVALID_Q = 0x20,
#ifndef OPENSSL_IS_BORINGSSL
 // BoringSSL does not define DH_CHECK_INVALID_J_VALUE.
 INVALID_J = 0x40,
Comment thread
panva marked this conversation as resolved.

 MODULUS_TOO_SMALL = 0x80,
 MODULUS_TOO_LARGE = 0x100,
Expand All@@ -1244,14 +1244,9 @@ class DHPointer final {

 enum class CheckPublicKeyResult {
 NONE,
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define DH_R_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
 TOO_SMALL = DH_R_CHECK_PUBKEY_TOO_SMALL,
 TOO_LARGE = DH_R_CHECK_PUBKEY_TOO_LARGE,
 INVALID = DH_R_CHECK_PUBKEY_INVALID,
#else
 INVALID = DH_R_INVALID_PUBKEY,
#endif
 TOO_SMALL,
 TOO_LARGE,
 INVALID,
 CHECK_FAILED = 512,
 };
 // Check to see if the given public key is suitable for this DH instance.
Expand DownExpand Up@@ -1346,9 +1341,6 @@ class SSLPointer final {
 bool setSession(const SSLSessionPointer& session);
 bool setSniContext(const SSLCtxPointer& ctx) const;

 const char* getClientHelloAlpn() const;
 const char* getClientHelloServerName() const;

 std::optional<const std::string_view> getServerName() const;
 X509View getCertificate() const;
 EVPKeyPointer getPeerTempKey() const;
Expand Down

2 changes: 0 additions & 2 deletions
src/crypto/crypto_dh.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -319,12 +319,10 @@ void ComputeSecret(const FunctionCallbackInfo<Value>& args) {
 case DHPointer::CheckPublicKeyResult::CHECK_FAILED:
 return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env,
 "Unspecified validation error");
#ifndef OPENSSL_IS_BORINGSSL
 case DHPointer::CheckPublicKeyResult::TOO_SMALL:
 return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too small");
 case DHPointer::CheckPublicKeyResult::TOO_LARGE:
 return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too large");
#endif
 case DHPointer::CheckPublicKeyResult::INVALID:
 return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env, "Supplied key is invalid");
 case DHPointer::CheckPublicKeyResult::NONE:
Expand Down

12 changes: 0 additions & 12 deletions
src/crypto/crypto_rsa.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,18 +137,6 @@ Maybe<void> RsaKeyGenTraits::AdditionalConfig(
 params->params.modulus_bits = args[*offset + 1].As<Uint32>()->Value();
 params->params.exponent = args[*offset + 2].As<Uint32>()->Value();

#ifdef OPENSSL_IS_BORINGSSL
 // BoringSSL hangs indefinitely generating an RSA key with e=1, and for
 // other invalid exponents (e=0, even values) reports the misleading error
 // RSA_R_TOO_MANY_ITERATIONS only after running the full keygen loop. Reject
 // those up-front with a clear error. The constraint here (odd integer >= 3)
 // matches BoringSSL's own rsa_check_public_key validation.
 if (params->params.exponent < 3 || (params->params.exponent & 1) == 0) {
 THROW_ERR_OUT_OF_RANGE(env, "publicExponent is invalid");
 return Nothing<void>();
 }
#endif

 *offset += 3;

 if (params->params.variant == kKeyVariantRSA_PSS) {
Expand Down

13 changes: 5 additions & 8 deletions
test/common/boringssl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,12 +137,9 @@ function testRenegotiationUnsupported() {
}

/**
 * OpenSSL exposes the negotiated ephemeral key type, name, and size for TLS
 * clients. With BoringSSL the same ECDHE TLS 1.2 handshake succeeds, but
 * getEphemeralKeyInfo() returns null on the server side and an object whose
 * fields are undefined on the client side.
 * BoringSSL exposes the negotiated TLS group but not the ephemeral key size.
 */
function testEphemeralKeyInfoUnsupported() {
function testEphemeralKeyInfo() {
 const server = tls.createServer({
 key: fixtures.readKey('agent2-key.pem'),
 cert: fixtures.readKey('agent2-cert.pem'),
Expand All@@ -161,8 +158,8 @@ function testEphemeralKeyInfoUnsupported() {
 maxVersion: 'TLSv1.2',
 }, common.mustCall(() => {
 assert.deepStrictEqual(client.getEphemeralKeyInfo(), {
 type: undefined,
 name: undefined,
 type: 'TLSGroup',
 name: 'prime256v1',
 size: undefined,
 });
 server.close();
Expand DownExpand Up@@ -337,7 +334,7 @@ module.exports = {
 assertMultiKeyUnsupported,
 assertNoCipherMatch,
 assertOpenSSLSecurityLevelsUnsupported,
testEphemeralKeyInfoUnsupported,
testEphemeralKeyInfo,
 testLegacyProtocolUnsupported,
 testMultiPfxSelectionDifference,
 testPskTls13Unsupported,
Expand Down

50 changes: 25 additions & 25 deletions
test/parallel/test-crypto-dh-curves.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,33 +35,33 @@ if (!process.features.openssl_is_boringssl) {
 assert.strictEqual(
 crypto.createDiffieHellman(notSafePrime, Buffer.from([2])).verifyError,
 DH_CHECK_P_NOT_SAFE_PRIME);

 const group = crypto.getDiffieHellman('modp14');
 const alice = crypto.createDiffieHellman(
 group.getPrime(), group.getGenerator());
 alice.generateKeys();
 const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
 assert.throws(
 () => alice.computeSecret(Buffer.from([1])),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too small'
 });
 assert.throws(
 () => alice.computeSecret(group.getPrime()),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
 assert.throws(
 () => alice.computeSecret(
 Buffer.from((groupPrime - 1n).toString(16), 'hex')),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
}

const group = crypto.getDiffieHellman('modp14');
const alice = crypto.createDiffieHellman(
 group.getPrime(), group.getGenerator());
alice.generateKeys();
const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
assert.throws(
 () => alice.computeSecret(Buffer.from([1])),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too small'
 });
assert.throws(
 () => alice.computeSecret(group.getPrime()),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
assert.throws(
 () => alice.computeSecret(
 Buffer.from((groupPrime - 1n).toString(16), 'hex')),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });

// Confirm DH_check() results are exposed for optional examination.
const bad_dh = process.features.openssl_is_boringssl ?
 crypto.createDiffieHellman('abcd', 'hex', 0) :
Expand Down

4 changes: 1 addition & 3 deletions
test/parallel/test-crypto-dh.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ const {
 {
 assert.throws(() => {
 dh3.computeSecret('');
 }, { message: process.features.openssl_is_boringssl ?
 'Supplied key is invalid' :
 'Supplied key is too small' });
 }, { message: 'Supplied key is too small' });
 }
}

Expand Down

31 changes: 13 additions & 18 deletions
test/parallel/test-crypto-keygen.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,25 +376,20 @@ const isBoringSSL = process.features.openssl_is_boringssl;
 }

 // Test invalid exponents. (caught by OpenSSL)
 let invalidExponentError = /bad e value/;
 if (isBoringSSL) {
 invalidExponentError = /BAD_E_VALUE/;
 } else if (hasOpenSSL3) {
 invalidExponentError = /exponent/;
 }
 for (const publicExponent of [1, 1 + 0x10001]) {
 if (isBoringSSL) {
 assert.throws(() => generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustNotCall()), {
 name: 'RangeError',
 code: 'ERR_OUT_OF_RANGE',
 message: 'publicExponent is invalid',
 });
 } else {
 generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustCall((err) => {
 assert.strictEqual(err.name, 'Error');
 assert.match(err.message, hasOpenSSL3 ? /exponent/ : /bad e value/);
 }));
 }
 generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustCall((err) => {
 assert.strictEqual(err.name, 'Error');
 assert.match(err.message, invalidExponentError);
 }));
 }
}

Expand Down

6 changes: 5 additions & 1 deletion
test/parallel/test-crypto-sec-level.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,8 @@ const assert = require('assert');
// This test simply validates that we can get some value for the secLevel
// when needed by tests.
const secLevel = require('internal/crypto/util').getOpenSSLSecLevel();
assert.ok(secLevel >= 0 && secLevel <= 5);
if (process.features.openssl_is_boringssl) {
 assert.strictEqual(secLevel, 0);
} else {
 assert.ok(secLevel >= 0 && secLevel <= 5);
}
Loading
Loading

, '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
crypto: remove obsolete BoringSSL shims and use available APIs#65423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

panva
wants to merge
3
commits into

from

 Closed


crypto: remove obsolete BoringSSL shims and use available APIs
#65423
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
20c21a5

crypto: remove obsolete BoringSSL shims


panva Aug 20, 2026
932b0fc

crypto: use available BoringSSL APIs


panva Aug 20, 2026
60d2e08

fixup! crypto: use available BoringSSL APIs


panva Aug 20, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


97 changes: 11 additions & 86 deletions
deps/ncrypto/ncrypto.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {

// ============================================================================
DataPointer DataPointer::Alloc(size_t len) {
#ifdef OPENSSL_IS_BORINGSSL
 // Boringssl does not implement OPENSSL_zalloc
 auto ptr = OPENSSL_malloc(len);
 if (ptr == nullptr) return {};
 memset(ptr, 0, len);
 return DataPointer(ptr, len);
#else
 return DataPointer(OPENSSL_zalloc(len), len);
#endif
}

DataPointer DataPointer::SecureAlloc(size_t len) {
Expand All@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
}

size_t DataPointer::GetSecureHeapUsed() {
#ifndef OPENSSL_IS_BORINGSSL
 return CRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
#else
 // BoringSSL does not have the secure heap and therefore
 // will always return 0.
 return 0;
#endif
}

DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
 size_t min) {
#ifndef OPENSSL_IS_BORINGSSL
 switch (CRYPTO_secure_malloc_init(amount, min)) {
 case 0:
 return InitSecureHeapResult::FAILED;
Expand All@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
 default:
 return InitSecureHeapResult::FAILED;
 }
#else
 // BoringSSL does not actually support the secure heap
 return InitSecureHeapResult::FAILED;
#endif
}

DataPointer DataPointer::Copy(const Buffer<const void>& buffer) {
Expand DownExpand Up@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
}

BignumPointer BignumPointer::NewSecure() {
#ifdef OPENSSL_IS_BORINGSSL
 // Boringssl does not implement BN_secure_new.
 return New();
#else
 return BignumPointer(BN_secure_new());
#endif
}

BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
Expand DownExpand Up@@ -2276,14 +2252,11 @@ DHPointer::CheckPublicKeyResult DHPointer::checkPublicKey(
 if (DH_check_pub_key(dh_.get(), pub_key.get(), &codes) != 1) {
 return DHPointer::CheckPublicKeyResult::CHECK_FAILED;
 }
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define DH_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
 if (codes & DH_CHECK_PUBKEY_TOO_SMALL) {
 return DHPointer::CheckPublicKeyResult::TOO_SMALL;
 } else if (codes & DH_CHECK_PUBKEY_TOO_LARGE) {
 return DHPointer::CheckPublicKeyResult::TOO_LARGE;
 }
#endif
 if (codes != 0) {
 return DHPointer::CheckPublicKeyResult::INVALID;
 }
Expand DownExpand Up@@ -4288,59 +4261,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
 return std::nullopt;
}

const char* SSLPointer::getClientHelloAlpn() const {
 if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
 const unsigned char* buf;
 size_t len;
 size_t rem;

 if (!SSL_client_hello_get0_ext(
 get(),
 TLSEXT_TYPE_application_layer_protocol_negotiation,
 &buf,
 &rem) ||
 rem < 2) {
 return {};
 }

 len = (buf[0] << 8) | buf[1];
 if (len + 2 != rem) return {};
 return reinterpret_cast<const char*>(buf + 3);
#else
 // Boringssl doesn't have a public API for this.
 return {};
#endif
}

const char* SSLPointer::getClientHelloServerName() const {
 if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
 const unsigned char* buf;
 size_t len;
 size_t rem;

 if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
 rem <= 2) {
 return {};
 }

 len = (*buf << 8) | *(buf + 1);
 if (len + 2 != rem) return {};
 rem = len;

 if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
 rem--;
 if (rem <= 2) return {};
 len = (*(buf + 3) << 8) | *(buf + 4);
 if (len + 2 > rem) return {};
 return reinterpret_cast<const char*>(buf + 5);
#else
 // Boringssl doesn't have a public API for this.
 return {};
#endif
}

std::optional<const std::string_view> SSLPointer::GetServerName(
 const SSL* ssl) {
 if (ssl == nullptr) return std::nullopt;
Expand DownExpand Up@@ -4386,6 +4306,13 @@ std::optional<std::string_view> SSLPointer::getNegotiatedGroup() const {
 const char* group = SSL_get0_group_name(get());
 if (group == nullptr) return std::nullopt;
 return group;
#elif defined(OPENSSL_IS_BORINGSSL)
 if (!ssl_) return std::nullopt;
 const int nid = SSL_get_negotiated_group(get());
 if (nid == NID_undef) return std::nullopt;
 const char* group = OBJ_nid2sn(nid);
 if (group == nullptr) return std::nullopt;
 return group;
#else
 return std::nullopt;
#endif
Expand All@@ -4410,19 +4337,17 @@ std::optional<std::string_view> SSLPointer::getCipherVersion() const {
}

std::optional<int> SSLPointer::getSecurityLevel() {
#ifndef OPENSSL_IS_BORINGSSL
 auto ctx = SSLCtxPointer::New();
 if (!ctx) return std::nullopt;

#ifdef OPENSSL_IS_BORINGSSL
 return SSL_CTX_get_security_level(ctx.get());
#else
 auto ssl = SSLPointer::New(ctx);
 if (!ssl) return std::nullopt;

 return SSL_get_security_level(ssl);
#else
 // OPENSSL_TLS_SECURITY_LEVEL is not defined in BoringSSL
 // so assume it is the default OPENSSL_TLS_SECURITY_LEVEL value.
 return 1;
#endif // OPENSSL_IS_BORINGSSL
#endif
}

SSLCtxPointer::SSLCtxPointer(SSL_CTX* ctx) : ctx_(ctx) {}
Expand Down

18 changes: 5 additions & 13 deletions
deps/ncrypto/ncrypto.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1231,9 +1231,9 @@ class DHPointer final {
 UNABLE_TO_CHECK_GENERATOR = 0x04,
 NOT_SUITABLE_GENERATOR = 0x08,
 Q_NOT_PRIME = 0x10,
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define the DH_CHECK_INVALID_[Q or J]_VALUE
 INVALID_Q = 0x20,
#ifndef OPENSSL_IS_BORINGSSL
 // BoringSSL does not define DH_CHECK_INVALID_J_VALUE.
 INVALID_J = 0x40,
Comment thread
panva marked this conversation as resolved.

 MODULUS_TOO_SMALL = 0x80,
 MODULUS_TOO_LARGE = 0x100,
Expand All@@ -1244,14 +1244,9 @@ class DHPointer final {

 enum class CheckPublicKeyResult {
 NONE,
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define DH_R_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
 TOO_SMALL = DH_R_CHECK_PUBKEY_TOO_SMALL,
 TOO_LARGE = DH_R_CHECK_PUBKEY_TOO_LARGE,
 INVALID = DH_R_CHECK_PUBKEY_INVALID,
#else
 INVALID = DH_R_INVALID_PUBKEY,
#endif
 TOO_SMALL,
 TOO_LARGE,
 INVALID,
 CHECK_FAILED = 512,
 };
 // Check to see if the given public key is suitable for this DH instance.
Expand DownExpand Up@@ -1346,9 +1341,6 @@ class SSLPointer final {
 bool setSession(const SSLSessionPointer& session);
 bool setSniContext(const SSLCtxPointer& ctx) const;

 const char* getClientHelloAlpn() const;
 const char* getClientHelloServerName() const;

 std::optional<const std::string_view> getServerName() const;
 X509View getCertificate() const;
 EVPKeyPointer getPeerTempKey() const;
Expand Down

2 changes: 0 additions & 2 deletions
src/crypto/crypto_dh.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -319,12 +319,10 @@ void ComputeSecret(const FunctionCallbackInfo<Value>& args) {
 case DHPointer::CheckPublicKeyResult::CHECK_FAILED:
 return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env,
 "Unspecified validation error");
#ifndef OPENSSL_IS_BORINGSSL
 case DHPointer::CheckPublicKeyResult::TOO_SMALL:
 return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too small");
 case DHPointer::CheckPublicKeyResult::TOO_LARGE:
 return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too large");
#endif
 case DHPointer::CheckPublicKeyResult::INVALID:
 return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env, "Supplied key is invalid");
 case DHPointer::CheckPublicKeyResult::NONE:
Expand Down

12 changes: 0 additions & 12 deletions
src/crypto/crypto_rsa.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,18 +137,6 @@ Maybe<void> RsaKeyGenTraits::AdditionalConfig(
 params->params.modulus_bits = args[*offset + 1].As<Uint32>()->Value();
 params->params.exponent = args[*offset + 2].As<Uint32>()->Value();

#ifdef OPENSSL_IS_BORINGSSL
 // BoringSSL hangs indefinitely generating an RSA key with e=1, and for
 // other invalid exponents (e=0, even values) reports the misleading error
 // RSA_R_TOO_MANY_ITERATIONS only after running the full keygen loop. Reject
 // those up-front with a clear error. The constraint here (odd integer >= 3)
 // matches BoringSSL's own rsa_check_public_key validation.
 if (params->params.exponent < 3 || (params->params.exponent & 1) == 0) {
 THROW_ERR_OUT_OF_RANGE(env, "publicExponent is invalid");
 return Nothing<void>();
 }
#endif

 *offset += 3;

 if (params->params.variant == kKeyVariantRSA_PSS) {
Expand Down

13 changes: 5 additions & 8 deletions
test/common/boringssl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,12 +137,9 @@ function testRenegotiationUnsupported() {
}

/**
 * OpenSSL exposes the negotiated ephemeral key type, name, and size for TLS
 * clients. With BoringSSL the same ECDHE TLS 1.2 handshake succeeds, but
 * getEphemeralKeyInfo() returns null on the server side and an object whose
 * fields are undefined on the client side.
 * BoringSSL exposes the negotiated TLS group but not the ephemeral key size.
 */
function testEphemeralKeyInfoUnsupported() {
function testEphemeralKeyInfo() {
 const server = tls.createServer({
 key: fixtures.readKey('agent2-key.pem'),
 cert: fixtures.readKey('agent2-cert.pem'),
Expand All@@ -161,8 +158,8 @@ function testEphemeralKeyInfoUnsupported() {
 maxVersion: 'TLSv1.2',
 }, common.mustCall(() => {
 assert.deepStrictEqual(client.getEphemeralKeyInfo(), {
 type: undefined,
 name: undefined,
 type: 'TLSGroup',
 name: 'prime256v1',
 size: undefined,
 });
 server.close();
Expand DownExpand Up@@ -337,7 +334,7 @@ module.exports = {
 assertMultiKeyUnsupported,
 assertNoCipherMatch,
 assertOpenSSLSecurityLevelsUnsupported,
testEphemeralKeyInfoUnsupported,
testEphemeralKeyInfo,
 testLegacyProtocolUnsupported,
 testMultiPfxSelectionDifference,
 testPskTls13Unsupported,
Expand Down

50 changes: 25 additions & 25 deletions
test/parallel/test-crypto-dh-curves.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,33 +35,33 @@ if (!process.features.openssl_is_boringssl) {
 assert.strictEqual(
 crypto.createDiffieHellman(notSafePrime, Buffer.from([2])).verifyError,
 DH_CHECK_P_NOT_SAFE_PRIME);

 const group = crypto.getDiffieHellman('modp14');
 const alice = crypto.createDiffieHellman(
 group.getPrime(), group.getGenerator());
 alice.generateKeys();
 const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
 assert.throws(
 () => alice.computeSecret(Buffer.from([1])),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too small'
 });
 assert.throws(
 () => alice.computeSecret(group.getPrime()),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
 assert.throws(
 () => alice.computeSecret(
 Buffer.from((groupPrime - 1n).toString(16), 'hex')),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
}

const group = crypto.getDiffieHellman('modp14');
const alice = crypto.createDiffieHellman(
 group.getPrime(), group.getGenerator());
alice.generateKeys();
const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
assert.throws(
 () => alice.computeSecret(Buffer.from([1])),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too small'
 });
assert.throws(
 () => alice.computeSecret(group.getPrime()),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
assert.throws(
 () => alice.computeSecret(
 Buffer.from((groupPrime - 1n).toString(16), 'hex')),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });

// Confirm DH_check() results are exposed for optional examination.
const bad_dh = process.features.openssl_is_boringssl ?
 crypto.createDiffieHellman('abcd', 'hex', 0) :
Expand Down

4 changes: 1 addition & 3 deletions
test/parallel/test-crypto-dh.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ const {
 {
 assert.throws(() => {
 dh3.computeSecret('');
 }, { message: process.features.openssl_is_boringssl ?
 'Supplied key is invalid' :
 'Supplied key is too small' });
 }, { message: 'Supplied key is too small' });
 }
}

Expand Down

31 changes: 13 additions & 18 deletions
test/parallel/test-crypto-keygen.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,25 +376,20 @@ const isBoringSSL = process.features.openssl_is_boringssl;
 }

 // Test invalid exponents. (caught by OpenSSL)
 let invalidExponentError = /bad e value/;
 if (isBoringSSL) {
 invalidExponentError = /BAD_E_VALUE/;
 } else if (hasOpenSSL3) {
 invalidExponentError = /exponent/;
 }
 for (const publicExponent of [1, 1 + 0x10001]) {
 if (isBoringSSL) {
 assert.throws(() => generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustNotCall()), {
 name: 'RangeError',
 code: 'ERR_OUT_OF_RANGE',
 message: 'publicExponent is invalid',
 });
 } else {
 generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustCall((err) => {
 assert.strictEqual(err.name, 'Error');
 assert.match(err.message, hasOpenSSL3 ? /exponent/ : /bad e value/);
 }));
 }
 generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustCall((err) => {
 assert.strictEqual(err.name, 'Error');
 assert.match(err.message, invalidExponentError);
 }));
 }
}

Expand Down

6 changes: 5 additions & 1 deletion
test/parallel/test-crypto-sec-level.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,8 @@ const assert = require('assert');
// This test simply validates that we can get some value for the secLevel
// when needed by tests.
const secLevel = require('internal/crypto/util').getOpenSSLSecLevel();
assert.ok(secLevel >= 0 && secLevel <= 5);
if (process.features.openssl_is_boringssl) {
 assert.strictEqual(secLevel, 0);
} else {
 assert.ok(secLevel >= 0 && secLevel <= 5);
}
Loading
Loading

, '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
crypto: remove obsolete BoringSSL shims and use available APIs#65423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

panva
wants to merge
3
commits into

from

 Closed


crypto: remove obsolete BoringSSL shims and use available APIs
#65423
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
20c21a5

crypto: remove obsolete BoringSSL shims


panva Aug 20, 2026
932b0fc

crypto: use available BoringSSL APIs


panva Aug 20, 2026
60d2e08

fixup! crypto: use available BoringSSL APIs


panva Aug 20, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


97 changes: 11 additions & 86 deletions
deps/ncrypto/ncrypto.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -396,15 +396,7 @@ std::optional<std::string> CryptoErrorList::pop_front() {

// ============================================================================
DataPointer DataPointer::Alloc(size_t len) {
#ifdef OPENSSL_IS_BORINGSSL
 // Boringssl does not implement OPENSSL_zalloc
 auto ptr = OPENSSL_malloc(len);
 if (ptr == nullptr) return {};
 memset(ptr, 0, len);
 return DataPointer(ptr, len);
#else
 return DataPointer(OPENSSL_zalloc(len), len);
#endif
}

DataPointer DataPointer::SecureAlloc(size_t len) {
Expand All@@ -427,18 +419,11 @@ DataPointer DataPointer::SecureAlloc(size_t len) {
}

size_t DataPointer::GetSecureHeapUsed() {
#ifndef OPENSSL_IS_BORINGSSL
 return CRYPTO_secure_malloc_initialized() ? CRYPTO_secure_used() : 0;
#else
 // BoringSSL does not have the secure heap and therefore
 // will always return 0.
 return 0;
#endif
}

DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
 size_t min) {
#ifndef OPENSSL_IS_BORINGSSL
 switch (CRYPTO_secure_malloc_init(amount, min)) {
 case 0:
 return InitSecureHeapResult::FAILED;
Expand All@@ -449,10 +434,6 @@ DataPointer::InitSecureHeapResult DataPointer::TryInitSecureHeap(size_t amount,
 default:
 return InitSecureHeapResult::FAILED;
 }
#else
 // BoringSSL does not actually support the secure heap
 return InitSecureHeapResult::FAILED;
#endif
}

DataPointer DataPointer::Copy(const Buffer<const void>& buffer) {
Expand DownExpand Up@@ -580,12 +561,7 @@ BignumPointer BignumPointer::New() {
}

BignumPointer BignumPointer::NewSecure() {
#ifdef OPENSSL_IS_BORINGSSL
 // Boringssl does not implement BN_secure_new.
 return New();
#else
 return BignumPointer(BN_secure_new());
#endif
}

BignumPointer& BignumPointer::operator=(BignumPointer&& other) noexcept {
Expand DownExpand Up@@ -2276,14 +2252,11 @@ DHPointer::CheckPublicKeyResult DHPointer::checkPublicKey(
 if (DH_check_pub_key(dh_.get(), pub_key.get(), &codes) != 1) {
 return DHPointer::CheckPublicKeyResult::CHECK_FAILED;
 }
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define DH_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
 if (codes & DH_CHECK_PUBKEY_TOO_SMALL) {
 return DHPointer::CheckPublicKeyResult::TOO_SMALL;
 } else if (codes & DH_CHECK_PUBKEY_TOO_LARGE) {
 return DHPointer::CheckPublicKeyResult::TOO_LARGE;
 }
#endif
 if (codes != 0) {
 return DHPointer::CheckPublicKeyResult::INVALID;
 }
Expand DownExpand Up@@ -4288,59 +4261,6 @@ std::optional<uint32_t> SSLPointer::verifyPeerCertificate() const {
 return std::nullopt;
}

const char* SSLPointer::getClientHelloAlpn() const {
 if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
 const unsigned char* buf;
 size_t len;
 size_t rem;

 if (!SSL_client_hello_get0_ext(
 get(),
 TLSEXT_TYPE_application_layer_protocol_negotiation,
 &buf,
 &rem) ||
 rem < 2) {
 return {};
 }

 len = (buf[0] << 8) | buf[1];
 if (len + 2 != rem) return {};
 return reinterpret_cast<const char*>(buf + 3);
#else
 // Boringssl doesn't have a public API for this.
 return {};
#endif
}

const char* SSLPointer::getClientHelloServerName() const {
 if (ssl_ == nullptr) return {};
#ifndef OPENSSL_IS_BORINGSSL
 const unsigned char* buf;
 size_t len;
 size_t rem;

 if (!SSL_client_hello_get0_ext(get(), TLSEXT_TYPE_server_name, &buf, &rem) ||
 rem <= 2) {
 return {};
 }

 len = (*buf << 8) | *(buf + 1);
 if (len + 2 != rem) return {};
 rem = len;

 if (rem == 0 || *(buf + 2) != TLSEXT_NAMETYPE_host_name) return {};
 rem--;
 if (rem <= 2) return {};
 len = (*(buf + 3) << 8) | *(buf + 4);
 if (len + 2 > rem) return {};
 return reinterpret_cast<const char*>(buf + 5);
#else
 // Boringssl doesn't have a public API for this.
 return {};
#endif
}

std::optional<const std::string_view> SSLPointer::GetServerName(
 const SSL* ssl) {
 if (ssl == nullptr) return std::nullopt;
Expand DownExpand Up@@ -4386,6 +4306,13 @@ std::optional<std::string_view> SSLPointer::getNegotiatedGroup() const {
 const char* group = SSL_get0_group_name(get());
 if (group == nullptr) return std::nullopt;
 return group;
#elif defined(OPENSSL_IS_BORINGSSL)
 if (!ssl_) return std::nullopt;
 const int nid = SSL_get_negotiated_group(get());
 if (nid == NID_undef) return std::nullopt;
 const char* group = OBJ_nid2sn(nid);
 if (group == nullptr) return std::nullopt;
 return group;
#else
 return std::nullopt;
#endif
Expand All@@ -4410,19 +4337,17 @@ std::optional<std::string_view> SSLPointer::getCipherVersion() const {
}

std::optional<int> SSLPointer::getSecurityLevel() {
#ifndef OPENSSL_IS_BORINGSSL
 auto ctx = SSLCtxPointer::New();
 if (!ctx) return std::nullopt;

#ifdef OPENSSL_IS_BORINGSSL
 return SSL_CTX_get_security_level(ctx.get());
#else
 auto ssl = SSLPointer::New(ctx);
 if (!ssl) return std::nullopt;

 return SSL_get_security_level(ssl);
#else
 // OPENSSL_TLS_SECURITY_LEVEL is not defined in BoringSSL
 // so assume it is the default OPENSSL_TLS_SECURITY_LEVEL value.
 return 1;
#endif // OPENSSL_IS_BORINGSSL
#endif
}

SSLCtxPointer::SSLCtxPointer(SSL_CTX* ctx) : ctx_(ctx) {}
Expand Down

18 changes: 5 additions & 13 deletions
deps/ncrypto/ncrypto.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1231,9 +1231,9 @@ class DHPointer final {
 UNABLE_TO_CHECK_GENERATOR = 0x04,
 NOT_SUITABLE_GENERATOR = 0x08,
 Q_NOT_PRIME = 0x10,
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define the DH_CHECK_INVALID_[Q or J]_VALUE
 INVALID_Q = 0x20,
#ifndef OPENSSL_IS_BORINGSSL
 // BoringSSL does not define DH_CHECK_INVALID_J_VALUE.
 INVALID_J = 0x40,
Comment thread
panva marked this conversation as resolved.

 MODULUS_TOO_SMALL = 0x80,
 MODULUS_TOO_LARGE = 0x100,
Expand All@@ -1244,14 +1244,9 @@ class DHPointer final {

 enum class CheckPublicKeyResult {
 NONE,
#ifndef OPENSSL_IS_BORINGSSL
 // Boringssl does not define DH_R_CHECK_PUBKEY_TOO_SMALL or TOO_LARGE
 TOO_SMALL = DH_R_CHECK_PUBKEY_TOO_SMALL,
 TOO_LARGE = DH_R_CHECK_PUBKEY_TOO_LARGE,
 INVALID = DH_R_CHECK_PUBKEY_INVALID,
#else
 INVALID = DH_R_INVALID_PUBKEY,
#endif
 TOO_SMALL,
 TOO_LARGE,
 INVALID,
 CHECK_FAILED = 512,
 };
 // Check to see if the given public key is suitable for this DH instance.
Expand DownExpand Up@@ -1346,9 +1341,6 @@ class SSLPointer final {
 bool setSession(const SSLSessionPointer& session);
 bool setSniContext(const SSLCtxPointer& ctx) const;

 const char* getClientHelloAlpn() const;
 const char* getClientHelloServerName() const;

 std::optional<const std::string_view> getServerName() const;
 X509View getCertificate() const;
 EVPKeyPointer getPeerTempKey() const;
Expand Down

2 changes: 0 additions & 2 deletions
src/crypto/crypto_dh.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -319,12 +319,10 @@ void ComputeSecret(const FunctionCallbackInfo<Value>& args) {
 case DHPointer::CheckPublicKeyResult::CHECK_FAILED:
 return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env,
 "Unspecified validation error");
#ifndef OPENSSL_IS_BORINGSSL
 case DHPointer::CheckPublicKeyResult::TOO_SMALL:
 return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too small");
 case DHPointer::CheckPublicKeyResult::TOO_LARGE:
 return THROW_ERR_CRYPTO_INVALID_KEYLEN(env, "Supplied key is too large");
#endif
 case DHPointer::CheckPublicKeyResult::INVALID:
 return THROW_ERR_CRYPTO_INVALID_KEYTYPE(env, "Supplied key is invalid");
 case DHPointer::CheckPublicKeyResult::NONE:
Expand Down

12 changes: 0 additions & 12 deletions
src/crypto/crypto_rsa.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,18 +137,6 @@ Maybe<void> RsaKeyGenTraits::AdditionalConfig(
 params->params.modulus_bits = args[*offset + 1].As<Uint32>()->Value();
 params->params.exponent = args[*offset + 2].As<Uint32>()->Value();

#ifdef OPENSSL_IS_BORINGSSL
 // BoringSSL hangs indefinitely generating an RSA key with e=1, and for
 // other invalid exponents (e=0, even values) reports the misleading error
 // RSA_R_TOO_MANY_ITERATIONS only after running the full keygen loop. Reject
 // those up-front with a clear error. The constraint here (odd integer >= 3)
 // matches BoringSSL's own rsa_check_public_key validation.
 if (params->params.exponent < 3 || (params->params.exponent & 1) == 0) {
 THROW_ERR_OUT_OF_RANGE(env, "publicExponent is invalid");
 return Nothing<void>();
 }
#endif

 *offset += 3;

 if (params->params.variant == kKeyVariantRSA_PSS) {
Expand Down

13 changes: 5 additions & 8 deletions
test/common/boringssl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,12 +137,9 @@ function testRenegotiationUnsupported() {
}

/**
 * OpenSSL exposes the negotiated ephemeral key type, name, and size for TLS
 * clients. With BoringSSL the same ECDHE TLS 1.2 handshake succeeds, but
 * getEphemeralKeyInfo() returns null on the server side and an object whose
 * fields are undefined on the client side.
 * BoringSSL exposes the negotiated TLS group but not the ephemeral key size.
 */
function testEphemeralKeyInfoUnsupported() {
function testEphemeralKeyInfo() {
 const server = tls.createServer({
 key: fixtures.readKey('agent2-key.pem'),
 cert: fixtures.readKey('agent2-cert.pem'),
Expand All@@ -161,8 +158,8 @@ function testEphemeralKeyInfoUnsupported() {
 maxVersion: 'TLSv1.2',
 }, common.mustCall(() => {
 assert.deepStrictEqual(client.getEphemeralKeyInfo(), {
 type: undefined,
 name: undefined,
 type: 'TLSGroup',
 name: 'prime256v1',
 size: undefined,
 });
 server.close();
Expand DownExpand Up@@ -337,7 +334,7 @@ module.exports = {
 assertMultiKeyUnsupported,
 assertNoCipherMatch,
 assertOpenSSLSecurityLevelsUnsupported,
testEphemeralKeyInfoUnsupported,
testEphemeralKeyInfo,
 testLegacyProtocolUnsupported,
 testMultiPfxSelectionDifference,
 testPskTls13Unsupported,
Expand Down

50 changes: 25 additions & 25 deletions
test/parallel/test-crypto-dh-curves.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,33 +35,33 @@ if (!process.features.openssl_is_boringssl) {
 assert.strictEqual(
 crypto.createDiffieHellman(notSafePrime, Buffer.from([2])).verifyError,
 DH_CHECK_P_NOT_SAFE_PRIME);

 const group = crypto.getDiffieHellman('modp14');
 const alice = crypto.createDiffieHellman(
 group.getPrime(), group.getGenerator());
 alice.generateKeys();
 const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
 assert.throws(
 () => alice.computeSecret(Buffer.from([1])),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too small'
 });
 assert.throws(
 () => alice.computeSecret(group.getPrime()),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
 assert.throws(
 () => alice.computeSecret(
 Buffer.from((groupPrime - 1n).toString(16), 'hex')),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
}

const group = crypto.getDiffieHellman('modp14');
const alice = crypto.createDiffieHellman(
 group.getPrime(), group.getGenerator());
alice.generateKeys();
const groupPrime = BigInt(`0x${group.getPrime('hex')}`);
assert.throws(
 () => alice.computeSecret(Buffer.from([1])),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too small'
 });
assert.throws(
 () => alice.computeSecret(group.getPrime()),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });
assert.throws(
 () => alice.computeSecret(
 Buffer.from((groupPrime - 1n).toString(16), 'hex')),
 {
 code: 'ERR_CRYPTO_INVALID_KEYLEN',
 message: 'Supplied key is too large'
 });

// Confirm DH_check() results are exposed for optional examination.
const bad_dh = process.features.openssl_is_boringssl ?
 crypto.createDiffieHellman('abcd', 'hex', 0) :
Expand Down

4 changes: 1 addition & 3 deletions
test/parallel/test-crypto-dh.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ const {
 {
 assert.throws(() => {
 dh3.computeSecret('');
 }, { message: process.features.openssl_is_boringssl ?
 'Supplied key is invalid' :
 'Supplied key is too small' });
 }, { message: 'Supplied key is too small' });
 }
}

Expand Down

31 changes: 13 additions & 18 deletions
test/parallel/test-crypto-keygen.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,25 +376,20 @@ const isBoringSSL = process.features.openssl_is_boringssl;
 }

 // Test invalid exponents. (caught by OpenSSL)
 let invalidExponentError = /bad e value/;
 if (isBoringSSL) {
 invalidExponentError = /BAD_E_VALUE/;
 } else if (hasOpenSSL3) {
 invalidExponentError = /exponent/;
 }
 for (const publicExponent of [1, 1 + 0x10001]) {
 if (isBoringSSL) {
 assert.throws(() => generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustNotCall()), {
 name: 'RangeError',
 code: 'ERR_OUT_OF_RANGE',
 message: 'publicExponent is invalid',
 });
 } else {
 generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustCall((err) => {
 assert.strictEqual(err.name, 'Error');
 assert.match(err.message, hasOpenSSL3 ? /exponent/ : /bad e value/);
 }));
 }
 generateKeyPair('rsa', {
 modulusLength: 4096,
 publicExponent
 }, common.mustCall((err) => {
 assert.strictEqual(err.name, 'Error');
 assert.match(err.message, invalidExponentError);
 }));
 }
}

Expand Down

6 changes: 5 additions & 1 deletion
test/parallel/test-crypto-sec-level.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,8 @@ const assert = require('assert');
// This test simply validates that we can get some value for the secLevel
// when needed by tests.
const secLevel = require('internal/crypto/util').getOpenSSLSecLevel();
assert.ok(secLevel >= 0 && secLevel <= 5);
if (process.features.openssl_is_boringssl) {
 assert.strictEqual(secLevel, 0);
} else {
 assert.ok(secLevel >= 0 && secLevel <= 5);
}
Loading
Loading