Commit 8f4ee7e

Browse files
pimterryaduh95
pimterry
authored and
aduh95
committed
tls: drop hand-rolled TLS client hello parser
This existed for 'resumeSession', which needed to do an async lookup though SSL_CTX_sess_set_get_cb is sync-only. Nowadays both OpenSSL & BoringSSL have an early ClientHello callback for suspend/resume to handle this properly, so it was redundant, in addition to being complicated and generally a bit fragile & scary. This PR switches to use the modern OpenSSL/BoringSSL mechanisms for this and drops the client hello parser & related infrastructure completely. In addition, there's a new test here, covering a fixed bug: the hello parser silently dropped fragmented hellos, which we now do handle correctly. Signed-off-by: Tim Perry <pimterry@gmail.com> PR-URL: #64827 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 2dd7d4c commit 8f4ee7e

14 files changed

Lines changed: 283 additions & 772 deletions

‎lib/internal/tls/wrap.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ function loadSession(hello) {
262262
returnowner.destroy(newERR_SOCKET_CLOSED());
263263

264264
owner._handle.loadSession(session);
265-
// Session is loaded. End the parser to allow handshaking to continue.
266-
owner._handle.endParser();
265+
// Session is loaded. Let the handshake continue.
266+
owner._handle.clientHelloDone();
267267
}
268268

269269
if(hello.sessionId.length<=0||
@@ -281,8 +281,8 @@ function loadSession(hello) {
281281
// Sessions with tickets can be resumed directly from the ticket, no server
282282
// session storage is necessary.
283283
// Without a call to a resumeSession listener, a session will never be
284-
// loaded, so end the parser to allow handshaking to continue.
285-
owner._handle.endParser();
284+
// loaded, so let the handshake continue.
285+
owner._handle.clientHelloDone();
286286
}
287287
}
288288

@@ -970,7 +970,6 @@ TLSSocket.prototype._init = function(socket, wrap) {
970970
if(this.server){
971971
if(this.server.listenerCount('resumeSession')>0||
972972
this.server.listenerCount('newSession')>0){
973-
// Also starts the client hello parser as a side effect.
974973
ssl.enableSessionCallbacks();
975974
}
976975
if(this.server.listenerCount('OCSPRequest')>0)

‎node.gyp‎

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@
406406
'src/crypto/crypto_rsa.cc',
407407
'src/crypto/crypto_spkac.cc',
408408
'src/crypto/crypto_util.cc',
409-
'src/crypto/crypto_clienthello.cc',
410409
'src/crypto/crypto_dh.cc',
411410
'src/crypto/crypto_hash.cc',
412411
'src/crypto/crypto_keys.cc',
@@ -416,7 +415,6 @@
416415
'src/crypto/crypto_x509.cc',
417416
'src/crypto/crypto_argon2.h',
418417
'src/crypto/crypto_bio.h',
419-
'src/crypto/crypto_clienthello-inl.h',
420418
'src/crypto/crypto_dh.h',
421419
'src/crypto/crypto_hmac.h',
422420
'src/crypto/crypto_kmac.h',
@@ -432,7 +430,6 @@
432430
'src/crypto/crypto_keygen.h',
433431
'src/crypto/crypto_scrypt.h',
434432
'src/crypto/crypto_tls.h',
435-
'src/crypto/crypto_clienthello.h',
436433
'src/crypto/crypto_context.h',
437434
'src/crypto/crypto_ec.h',
438435
'src/crypto/crypto_pqc.h',
@@ -462,7 +459,6 @@
462459
'src/tracing/trace_event_legacy.h',
463460
],
464461
'node_cctest_openssl_sources': [
465-
'test/cctest/test_crypto_clienthello.cc',
466462
'test/cctest/test_node_crypto.cc',
467463
'test/cctest/test_node_crypto_env.cc',
468464
],
@@ -1297,54 +1293,6 @@
12971293
}],
12981294
],
12991295
}, # fuzz_env
1300-
{ # fuzz_ClientHelloParser.cc
1301-
'target_name': 'fuzz_ClientHelloParser',
1302-
'type': 'executable',
1303-
'dependencies': [
1304-
'<(node_lib_target_name)',
1305-
],
1306-
'includes': [
1307-
'node.gypi'
1308-
],
1309-
'include_dirs': [
1310-
'src',
1311-
'tools/msvs/genfiles',
1312-
'deps/v8/include',
1313-
'deps/cares/include',
1314-
'deps/uv/include',
1315-
'test/cctest',
1316-
],
1317-
'defines': [
1318-
'NODE_ARCH="<(target_arch)"',
1319-
'NODE_PLATFORM="<(OS)"',
1320-
'NODE_WANT_INTERNALS=1',
1321-
],
1322-
'sources': [
1323-
'test/fuzzers/fuzz_ClientHelloParser.cc',
1324-
],
1325-
'conditions': [
1326-
[ 'node_shared_hdr_histogram=="false"', {
1327-
'dependencies': [
1328-
'deps/histogram/histogram.gyp:histogram',
1329-
],
1330-
}],
1331-
[ 'node_shared_uvwasi=="false"', {
1332-
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
1333-
'include_dirs': [ 'deps/uvwasi/include' ],
1334-
}],
1335-
['OS=="linux" or OS=="openharmony"', {
1336-
'ldflags': [ '-fsanitize=fuzzer' ]
1337-
}],
1338-
# Ensure that ossfuzz flag has been set and that we are on Linux
1339-
[ 'OS not in "linux openharmony" or ossfuzz!="true"', {
1340-
'type': 'none',
1341-
}],
1342-
# Avoid excessive LTO
1343-
['enable_lto=="true"', {
1344-
'ldflags': [ '-fno-lto' ],
1345-
}],
1346-
],
1347-
}, # fuzz_ClientHelloParser.cc
13481296
{ # fuzz_strings
13491297
'target_name': 'fuzz_strings',
13501298
'type': 'executable',

‎src/crypto/README.md‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,26 @@ throughout the rest of the code.
3030
The rest of the files are structured by their function, as detailed in the
3131
following table:
3232

33-
| File (\*.h/\*.cc) | Description |
34-
| -------------------- | -------------------------------------------------------------------------- |
35-
|`crypto_aes`| AES Cipher support. |
36-
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37-
|`crypto_cipher`| General Encryption/Decryption utilities. |
38-
|`crypto_clienthello`| TLS/SSL client hello parser implementation. Used during SSL/TLS handshake. |
39-
|`crypto_context`| Implementation of the `SecureContext` object. |
40-
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
41-
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
42-
|`crypto_ec`| Elliptic-curve cryptography implementation. |
43-
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
44-
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
45-
|`crypto_hmac`| HMAC implementations. |
46-
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
47-
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
48-
|`crypto_rsa`| RSA Key Generation functions. |
49-
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
50-
|`crypto_sig`| General digital signature and verification utilities. |
51-
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
52-
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
53-
|`crypto_timing`| Implementation of the TimingSafeEqual. |
33+
| File (\*.h/\*.cc) | Description |
34+
| ----------------- | -------------------------------------------------------------------- |
35+
|`crypto_aes`| AES Cipher support. |
36+
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37+
|`crypto_cipher`| General Encryption/Decryption utilities. |
38+
|`crypto_context`| Implementation of the `SecureContext` object. |
39+
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
40+
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
41+
|`crypto_ec`| Elliptic-curve cryptography implementation. |
42+
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
43+
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
44+
|`crypto_hmac`| HMAC implementations. |
45+
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
46+
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
47+
|`crypto_rsa`| RSA Key Generation functions. |
48+
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
49+
|`crypto_sig`| General digital signature and verification utilities. |
50+
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
51+
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
52+
|`crypto_timing`| Implementation of the TimingSafeEqual. |
5453

5554
When new crypto protocols are added, they will be added into their own
5655
`crypto_``*.h` and `*.cc` files.

‎src/crypto/crypto_clienthello-inl.h‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

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

Skip to content
Commit 8f4ee7e
Browse files
pimterryaduh95
pimterry
authored and
aduh95
committed
tls: drop hand-rolled TLS client hello parser
This existed for 'resumeSession', which needed to do an async lookup
though SSL_CTX_sess_set_get_cb is sync-only. Nowadays both OpenSSL &
BoringSSL have an early ClientHello callback for suspend/resume to
handle this properly, so it was redundant, in addition to being
complicated and generally a bit fragile & scary.
This PR switches to use the modern OpenSSL/BoringSSL mechanisms for this
and drops the client hello parser & related infrastructure completely.
In addition, there's a new test here, covering a fixed bug: the hello
parser silently dropped fragmented hellos, which we now do handle
correctly.
Signed-off-by: Tim Perry <pimterry@gmail.com>
PR-URL: #64827
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 2dd7d4c commit 8f4ee7e
14 files changed
Lines changed: 283 additions & 772 deletions
‎lib/internal/tls/wrap.js‎
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ function loadSession(hello) {
262262
returnowner.destroy(newERR_SOCKET_CLOSED());
263263

264264
owner._handle.loadSession(session);
265-
// Session is loaded. End the parser to allow handshaking to continue.
266-
owner._handle.endParser();
265+
// Session is loaded. Let the handshake continue.
266+
owner._handle.clientHelloDone();
267267
}
268268

269269
if(hello.sessionId.length<=0||
@@ -281,8 +281,8 @@ function loadSession(hello) {
281281
// Sessions with tickets can be resumed directly from the ticket, no server
282282
// session storage is necessary.
283283
// Without a call to a resumeSession listener, a session will never be
284-
// loaded, so end the parser to allow handshaking to continue.
285-
owner._handle.endParser();
284+
// loaded, so let the handshake continue.
285+
owner._handle.clientHelloDone();
286286
}
287287
}
288288

@@ -970,7 +970,6 @@ TLSSocket.prototype._init = function(socket, wrap) {
970970
if(this.server){
971971
if(this.server.listenerCount('resumeSession')>0||
972972
this.server.listenerCount('newSession')>0){
973-
// Also starts the client hello parser as a side effect.
974973
ssl.enableSessionCallbacks();
975974
}
976975
if(this.server.listenerCount('OCSPRequest')>0)
‎node.gyp‎
Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@
406406
'src/crypto/crypto_rsa.cc',
407407
'src/crypto/crypto_spkac.cc',
408408
'src/crypto/crypto_util.cc',
409-
'src/crypto/crypto_clienthello.cc',
410409
'src/crypto/crypto_dh.cc',
411410
'src/crypto/crypto_hash.cc',
412411
'src/crypto/crypto_keys.cc',
@@ -416,7 +415,6 @@
416415
'src/crypto/crypto_x509.cc',
417416
'src/crypto/crypto_argon2.h',
418417
'src/crypto/crypto_bio.h',
419-
'src/crypto/crypto_clienthello-inl.h',
420418
'src/crypto/crypto_dh.h',
421419
'src/crypto/crypto_hmac.h',
422420
'src/crypto/crypto_kmac.h',
@@ -432,7 +430,6 @@
432430
'src/crypto/crypto_keygen.h',
433431
'src/crypto/crypto_scrypt.h',
434432
'src/crypto/crypto_tls.h',
435-
'src/crypto/crypto_clienthello.h',
436433
'src/crypto/crypto_context.h',
437434
'src/crypto/crypto_ec.h',
438435
'src/crypto/crypto_pqc.h',
@@ -462,7 +459,6 @@
462459
'src/tracing/trace_event_legacy.h',
463460
 ],
464461
'node_cctest_openssl_sources': [
465-
'test/cctest/test_crypto_clienthello.cc',
466462
'test/cctest/test_node_crypto.cc',
467463
'test/cctest/test_node_crypto_env.cc',
468464
 ],
@@ -1297,54 +1293,6 @@
12971293
 }],
12981294
 ],
12991295
 }, # fuzz_env
1300-
 { # fuzz_ClientHelloParser.cc
1301-
'target_name': 'fuzz_ClientHelloParser',
1302-
'type': 'executable',
1303-
'dependencies': [
1304-
'<(node_lib_target_name)',
1305-
 ],
1306-
'includes': [
1307-
'node.gypi'
1308-
 ],
1309-
'include_dirs': [
1310-
'src',
1311-
'tools/msvs/genfiles',
1312-
'deps/v8/include',
1313-
'deps/cares/include',
1314-
'deps/uv/include',
1315-
'test/cctest',
1316-
 ],
1317-
'defines': [
1318-
'NODE_ARCH="<(target_arch)"',
1319-
'NODE_PLATFORM="<(OS)"',
1320-
'NODE_WANT_INTERNALS=1',
1321-
 ],
1322-
'sources': [
1323-
'test/fuzzers/fuzz_ClientHelloParser.cc',
1324-
 ],
1325-
'conditions': [
1326-
 [ 'node_shared_hdr_histogram=="false"', {
1327-
'dependencies': [
1328-
'deps/histogram/histogram.gyp:histogram',
1329-
 ],
1330-
 }],
1331-
 [ 'node_shared_uvwasi=="false"', {
1332-
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
1333-
'include_dirs': [ 'deps/uvwasi/include' ],
1334-
 }],
1335-
 ['OS=="linux" or OS=="openharmony"', {
1336-
'ldflags': [ '-fsanitize=fuzzer' ]
1337-
 }],
1338-
# Ensure that ossfuzz flag has been set and that we are on Linux
1339-
 [ 'OS not in "linux openharmony" or ossfuzz!="true"', {
1340-
'type': 'none',
1341-
 }],
1342-
# Avoid excessive LTO
1343-
 ['enable_lto=="true"', {
1344-
'ldflags': [ '-fno-lto' ],
1345-
 }],
1346-
 ],
1347-
 }, # fuzz_ClientHelloParser.cc
13481296
 { # fuzz_strings
13491297
'target_name': 'fuzz_strings',
13501298
'type': 'executable',
‎src/crypto/README.md‎
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,26 @@ throughout the rest of the code.
3030
The rest of the files are structured by their function, as detailed in the
3131
following table:
3232

33-
| File (\*.h/\*.cc) | Description |
34-
| -------------------- | -------------------------------------------------------------------------- |
35-
|`crypto_aes`| AES Cipher support. |
36-
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37-
|`crypto_cipher`| General Encryption/Decryption utilities. |
38-
|`crypto_clienthello`| TLS/SSL client hello parser implementation. Used during SSL/TLS handshake. |
39-
|`crypto_context`| Implementation of the `SecureContext` object. |
40-
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
41-
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
42-
|`crypto_ec`| Elliptic-curve cryptography implementation. |
43-
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
44-
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
45-
|`crypto_hmac`| HMAC implementations. |
46-
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
47-
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
48-
|`crypto_rsa`| RSA Key Generation functions. |
49-
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
50-
|`crypto_sig`| General digital signature and verification utilities. |
51-
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
52-
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
53-
|`crypto_timing`| Implementation of the TimingSafeEqual. |
33+
| File (\*.h/\*.cc) | Description |
34+
| ----------------- | -------------------------------------------------------------------- |
35+
|`crypto_aes`| AES Cipher support. |
36+
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37+
|`crypto_cipher`| General Encryption/Decryption utilities. |
38+
|`crypto_context`| Implementation of the `SecureContext` object. |
39+
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
40+
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
41+
|`crypto_ec`| Elliptic-curve cryptography implementation. |
42+
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
43+
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
44+
|`crypto_hmac`| HMAC implementations. |
45+
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
46+
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
47+
|`crypto_rsa`| RSA Key Generation functions. |
48+
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
49+
|`crypto_sig`| General digital signature and verification utilities. |
50+
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
51+
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
52+
|`crypto_timing`| Implementation of the TimingSafeEqual. |
5453

5554
When new crypto protocols are added, they will be added into their own
5655
`crypto_``*.h` and `*.cc` files.
‎src/crypto/crypto_clienthello-inl.h‎
Lines changed: 0 additions & 90 deletions
This file was deleted.
0 commit comments
Comments
 (0)

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

Skip to content
Commit 8f4ee7e
Browse files
pimterryaduh95
pimterry
authored and
aduh95
committed
tls: drop hand-rolled TLS client hello parser
This existed for 'resumeSession', which needed to do an async lookup
though SSL_CTX_sess_set_get_cb is sync-only. Nowadays both OpenSSL &
BoringSSL have an early ClientHello callback for suspend/resume to
handle this properly, so it was redundant, in addition to being
complicated and generally a bit fragile & scary.
This PR switches to use the modern OpenSSL/BoringSSL mechanisms for this
and drops the client hello parser & related infrastructure completely.
In addition, there's a new test here, covering a fixed bug: the hello
parser silently dropped fragmented hellos, which we now do handle
correctly.
Signed-off-by: Tim Perry <pimterry@gmail.com>
PR-URL: #64827
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 2dd7d4c commit 8f4ee7e
14 files changed
Lines changed: 283 additions & 772 deletions
‎lib/internal/tls/wrap.js‎
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ function loadSession(hello) {
262262
returnowner.destroy(newERR_SOCKET_CLOSED());
263263

264264
owner._handle.loadSession(session);
265-
// Session is loaded. End the parser to allow handshaking to continue.
266-
owner._handle.endParser();
265+
// Session is loaded. Let the handshake continue.
266+
owner._handle.clientHelloDone();
267267
}
268268

269269
if(hello.sessionId.length<=0||
@@ -281,8 +281,8 @@ function loadSession(hello) {
281281
// Sessions with tickets can be resumed directly from the ticket, no server
282282
// session storage is necessary.
283283
// Without a call to a resumeSession listener, a session will never be
284-
// loaded, so end the parser to allow handshaking to continue.
285-
owner._handle.endParser();
284+
// loaded, so let the handshake continue.
285+
owner._handle.clientHelloDone();
286286
}
287287
}
288288

@@ -970,7 +970,6 @@ TLSSocket.prototype._init = function(socket, wrap) {
970970
if(this.server){
971971
if(this.server.listenerCount('resumeSession')>0||
972972
this.server.listenerCount('newSession')>0){
973-
// Also starts the client hello parser as a side effect.
974973
ssl.enableSessionCallbacks();
975974
}
976975
if(this.server.listenerCount('OCSPRequest')>0)
‎node.gyp‎
Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@
406406
'src/crypto/crypto_rsa.cc',
407407
'src/crypto/crypto_spkac.cc',
408408
'src/crypto/crypto_util.cc',
409-
'src/crypto/crypto_clienthello.cc',
410409
'src/crypto/crypto_dh.cc',
411410
'src/crypto/crypto_hash.cc',
412411
'src/crypto/crypto_keys.cc',
@@ -416,7 +415,6 @@
416415
'src/crypto/crypto_x509.cc',
417416
'src/crypto/crypto_argon2.h',
418417
'src/crypto/crypto_bio.h',
419-
'src/crypto/crypto_clienthello-inl.h',
420418
'src/crypto/crypto_dh.h',
421419
'src/crypto/crypto_hmac.h',
422420
'src/crypto/crypto_kmac.h',
@@ -432,7 +430,6 @@
432430
'src/crypto/crypto_keygen.h',
433431
'src/crypto/crypto_scrypt.h',
434432
'src/crypto/crypto_tls.h',
435-
'src/crypto/crypto_clienthello.h',
436433
'src/crypto/crypto_context.h',
437434
'src/crypto/crypto_ec.h',
438435
'src/crypto/crypto_pqc.h',
@@ -462,7 +459,6 @@
462459
'src/tracing/trace_event_legacy.h',
463460
 ],
464461
'node_cctest_openssl_sources': [
465-
'test/cctest/test_crypto_clienthello.cc',
466462
'test/cctest/test_node_crypto.cc',
467463
'test/cctest/test_node_crypto_env.cc',
468464
 ],
@@ -1297,54 +1293,6 @@
12971293
 }],
12981294
 ],
12991295
 }, # fuzz_env
1300-
 { # fuzz_ClientHelloParser.cc
1301-
'target_name': 'fuzz_ClientHelloParser',
1302-
'type': 'executable',
1303-
'dependencies': [
1304-
'<(node_lib_target_name)',
1305-
 ],
1306-
'includes': [
1307-
'node.gypi'
1308-
 ],
1309-
'include_dirs': [
1310-
'src',
1311-
'tools/msvs/genfiles',
1312-
'deps/v8/include',
1313-
'deps/cares/include',
1314-
'deps/uv/include',
1315-
'test/cctest',
1316-
 ],
1317-
'defines': [
1318-
'NODE_ARCH="<(target_arch)"',
1319-
'NODE_PLATFORM="<(OS)"',
1320-
'NODE_WANT_INTERNALS=1',
1321-
 ],
1322-
'sources': [
1323-
'test/fuzzers/fuzz_ClientHelloParser.cc',
1324-
 ],
1325-
'conditions': [
1326-
 [ 'node_shared_hdr_histogram=="false"', {
1327-
'dependencies': [
1328-
'deps/histogram/histogram.gyp:histogram',
1329-
 ],
1330-
 }],
1331-
 [ 'node_shared_uvwasi=="false"', {
1332-
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
1333-
'include_dirs': [ 'deps/uvwasi/include' ],
1334-
 }],
1335-
 ['OS=="linux" or OS=="openharmony"', {
1336-
'ldflags': [ '-fsanitize=fuzzer' ]
1337-
 }],
1338-
# Ensure that ossfuzz flag has been set and that we are on Linux
1339-
 [ 'OS not in "linux openharmony" or ossfuzz!="true"', {
1340-
'type': 'none',
1341-
 }],
1342-
# Avoid excessive LTO
1343-
 ['enable_lto=="true"', {
1344-
'ldflags': [ '-fno-lto' ],
1345-
 }],
1346-
 ],
1347-
 }, # fuzz_ClientHelloParser.cc
13481296
 { # fuzz_strings
13491297
'target_name': 'fuzz_strings',
13501298
'type': 'executable',
‎src/crypto/README.md‎
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,26 @@ throughout the rest of the code.
3030
The rest of the files are structured by their function, as detailed in the
3131
following table:
3232

33-
| File (\*.h/\*.cc) | Description |
34-
| -------------------- | -------------------------------------------------------------------------- |
35-
|`crypto_aes`| AES Cipher support. |
36-
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37-
|`crypto_cipher`| General Encryption/Decryption utilities. |
38-
|`crypto_clienthello`| TLS/SSL client hello parser implementation. Used during SSL/TLS handshake. |
39-
|`crypto_context`| Implementation of the `SecureContext` object. |
40-
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
41-
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
42-
|`crypto_ec`| Elliptic-curve cryptography implementation. |
43-
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
44-
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
45-
|`crypto_hmac`| HMAC implementations. |
46-
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
47-
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
48-
|`crypto_rsa`| RSA Key Generation functions. |
49-
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
50-
|`crypto_sig`| General digital signature and verification utilities. |
51-
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
52-
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
53-
|`crypto_timing`| Implementation of the TimingSafeEqual. |
33+
| File (\*.h/\*.cc) | Description |
34+
| ----------------- | -------------------------------------------------------------------- |
35+
|`crypto_aes`| AES Cipher support. |
36+
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37+
|`crypto_cipher`| General Encryption/Decryption utilities. |
38+
|`crypto_context`| Implementation of the `SecureContext` object. |
39+
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
40+
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
41+
|`crypto_ec`| Elliptic-curve cryptography implementation. |
42+
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
43+
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
44+
|`crypto_hmac`| HMAC implementations. |
45+
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
46+
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
47+
|`crypto_rsa`| RSA Key Generation functions. |
48+
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
49+
|`crypto_sig`| General digital signature and verification utilities. |
50+
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
51+
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
52+
|`crypto_timing`| Implementation of the TimingSafeEqual. |
5453

5554
When new crypto protocols are added, they will be added into their own
5655
`crypto_``*.h` and `*.cc` files.
‎src/crypto/crypto_clienthello-inl.h‎
Lines changed: 0 additions & 90 deletions
This file was deleted.
0 commit comments
Comments
 (0)

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

Skip to content
Commit 8f4ee7e
Browse files
pimterryaduh95
pimterry
authored and
aduh95
committed
tls: drop hand-rolled TLS client hello parser
This existed for 'resumeSession', which needed to do an async lookup
though SSL_CTX_sess_set_get_cb is sync-only. Nowadays both OpenSSL &
BoringSSL have an early ClientHello callback for suspend/resume to
handle this properly, so it was redundant, in addition to being
complicated and generally a bit fragile & scary.
This PR switches to use the modern OpenSSL/BoringSSL mechanisms for this
and drops the client hello parser & related infrastructure completely.
In addition, there's a new test here, covering a fixed bug: the hello
parser silently dropped fragmented hellos, which we now do handle
correctly.
Signed-off-by: Tim Perry <pimterry@gmail.com>
PR-URL: #64827
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 2dd7d4c commit 8f4ee7e
14 files changed
Lines changed: 283 additions & 772 deletions
‎lib/internal/tls/wrap.js‎
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ function loadSession(hello) {
262262
returnowner.destroy(newERR_SOCKET_CLOSED());
263263

264264
owner._handle.loadSession(session);
265-
// Session is loaded. End the parser to allow handshaking to continue.
266-
owner._handle.endParser();
265+
// Session is loaded. Let the handshake continue.
266+
owner._handle.clientHelloDone();
267267
}
268268

269269
if(hello.sessionId.length<=0||
@@ -281,8 +281,8 @@ function loadSession(hello) {
281281
// Sessions with tickets can be resumed directly from the ticket, no server
282282
// session storage is necessary.
283283
// Without a call to a resumeSession listener, a session will never be
284-
// loaded, so end the parser to allow handshaking to continue.
285-
owner._handle.endParser();
284+
// loaded, so let the handshake continue.
285+
owner._handle.clientHelloDone();
286286
}
287287
}
288288

@@ -970,7 +970,6 @@ TLSSocket.prototype._init = function(socket, wrap) {
970970
if(this.server){
971971
if(this.server.listenerCount('resumeSession')>0||
972972
this.server.listenerCount('newSession')>0){
973-
// Also starts the client hello parser as a side effect.
974973
ssl.enableSessionCallbacks();
975974
}
976975
if(this.server.listenerCount('OCSPRequest')>0)
‎node.gyp‎
Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@
406406
'src/crypto/crypto_rsa.cc',
407407
'src/crypto/crypto_spkac.cc',
408408
'src/crypto/crypto_util.cc',
409-
'src/crypto/crypto_clienthello.cc',
410409
'src/crypto/crypto_dh.cc',
411410
'src/crypto/crypto_hash.cc',
412411
'src/crypto/crypto_keys.cc',
@@ -416,7 +415,6 @@
416415
'src/crypto/crypto_x509.cc',
417416
'src/crypto/crypto_argon2.h',
418417
'src/crypto/crypto_bio.h',
419-
'src/crypto/crypto_clienthello-inl.h',
420418
'src/crypto/crypto_dh.h',
421419
'src/crypto/crypto_hmac.h',
422420
'src/crypto/crypto_kmac.h',
@@ -432,7 +430,6 @@
432430
'src/crypto/crypto_keygen.h',
433431
'src/crypto/crypto_scrypt.h',
434432
'src/crypto/crypto_tls.h',
435-
'src/crypto/crypto_clienthello.h',
436433
'src/crypto/crypto_context.h',
437434
'src/crypto/crypto_ec.h',
438435
'src/crypto/crypto_pqc.h',
@@ -462,7 +459,6 @@
462459
'src/tracing/trace_event_legacy.h',
463460
 ],
464461
'node_cctest_openssl_sources': [
465-
'test/cctest/test_crypto_clienthello.cc',
466462
'test/cctest/test_node_crypto.cc',
467463
'test/cctest/test_node_crypto_env.cc',
468464
 ],
@@ -1297,54 +1293,6 @@
12971293
 }],
12981294
 ],
12991295
 }, # fuzz_env
1300-
 { # fuzz_ClientHelloParser.cc
1301-
'target_name': 'fuzz_ClientHelloParser',
1302-
'type': 'executable',
1303-
'dependencies': [
1304-
'<(node_lib_target_name)',
1305-
 ],
1306-
'includes': [
1307-
'node.gypi'
1308-
 ],
1309-
'include_dirs': [
1310-
'src',
1311-
'tools/msvs/genfiles',
1312-
'deps/v8/include',
1313-
'deps/cares/include',
1314-
'deps/uv/include',
1315-
'test/cctest',
1316-
 ],
1317-
'defines': [
1318-
'NODE_ARCH="<(target_arch)"',
1319-
'NODE_PLATFORM="<(OS)"',
1320-
'NODE_WANT_INTERNALS=1',
1321-
 ],
1322-
'sources': [
1323-
'test/fuzzers/fuzz_ClientHelloParser.cc',
1324-
 ],
1325-
'conditions': [
1326-
 [ 'node_shared_hdr_histogram=="false"', {
1327-
'dependencies': [
1328-
'deps/histogram/histogram.gyp:histogram',
1329-
 ],
1330-
 }],
1331-
 [ 'node_shared_uvwasi=="false"', {
1332-
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
1333-
'include_dirs': [ 'deps/uvwasi/include' ],
1334-
 }],
1335-
 ['OS=="linux" or OS=="openharmony"', {
1336-
'ldflags': [ '-fsanitize=fuzzer' ]
1337-
 }],
1338-
# Ensure that ossfuzz flag has been set and that we are on Linux
1339-
 [ 'OS not in "linux openharmony" or ossfuzz!="true"', {
1340-
'type': 'none',
1341-
 }],
1342-
# Avoid excessive LTO
1343-
 ['enable_lto=="true"', {
1344-
'ldflags': [ '-fno-lto' ],
1345-
 }],
1346-
 ],
1347-
 }, # fuzz_ClientHelloParser.cc
13481296
 { # fuzz_strings
13491297
'target_name': 'fuzz_strings',
13501298
'type': 'executable',
‎src/crypto/README.md‎
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,26 @@ throughout the rest of the code.
3030
The rest of the files are structured by their function, as detailed in the
3131
following table:
3232

33-
| File (\*.h/\*.cc) | Description |
34-
| -------------------- | -------------------------------------------------------------------------- |
35-
|`crypto_aes`| AES Cipher support. |
36-
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37-
|`crypto_cipher`| General Encryption/Decryption utilities. |
38-
|`crypto_clienthello`| TLS/SSL client hello parser implementation. Used during SSL/TLS handshake. |
39-
|`crypto_context`| Implementation of the `SecureContext` object. |
40-
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
41-
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
42-
|`crypto_ec`| Elliptic-curve cryptography implementation. |
43-
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
44-
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
45-
|`crypto_hmac`| HMAC implementations. |
46-
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
47-
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
48-
|`crypto_rsa`| RSA Key Generation functions. |
49-
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
50-
|`crypto_sig`| General digital signature and verification utilities. |
51-
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
52-
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
53-
|`crypto_timing`| Implementation of the TimingSafeEqual. |
33+
| File (\*.h/\*.cc) | Description |
34+
| ----------------- | -------------------------------------------------------------------- |
35+
|`crypto_aes`| AES Cipher support. |
36+
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37+
|`crypto_cipher`| General Encryption/Decryption utilities. |
38+
|`crypto_context`| Implementation of the `SecureContext` object. |
39+
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
40+
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
41+
|`crypto_ec`| Elliptic-curve cryptography implementation. |
42+
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
43+
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
44+
|`crypto_hmac`| HMAC implementations. |
45+
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
46+
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
47+
|`crypto_rsa`| RSA Key Generation functions. |
48+
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
49+
|`crypto_sig`| General digital signature and verification utilities. |
50+
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
51+
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
52+
|`crypto_timing`| Implementation of the TimingSafeEqual. |
5453

5554
When new crypto protocols are added, they will be added into their own
5655
`crypto_``*.h` and `*.cc` files.
‎src/crypto/crypto_clienthello-inl.h‎
Lines changed: 0 additions & 90 deletions
This file was deleted.
0 commit comments
Comments
 (0)

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

Skip to content
Commit 8f4ee7e
Browse files
pimterryaduh95
pimterry
authored and
aduh95
committed
tls: drop hand-rolled TLS client hello parser
This existed for 'resumeSession', which needed to do an async lookup
though SSL_CTX_sess_set_get_cb is sync-only. Nowadays both OpenSSL &
BoringSSL have an early ClientHello callback for suspend/resume to
handle this properly, so it was redundant, in addition to being
complicated and generally a bit fragile & scary.
This PR switches to use the modern OpenSSL/BoringSSL mechanisms for this
and drops the client hello parser & related infrastructure completely.
In addition, there's a new test here, covering a fixed bug: the hello
parser silently dropped fragmented hellos, which we now do handle
correctly.
Signed-off-by: Tim Perry <pimterry@gmail.com>
PR-URL: #64827
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 2dd7d4c commit 8f4ee7e
14 files changed
Lines changed: 283 additions & 772 deletions
‎lib/internal/tls/wrap.js‎
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ function loadSession(hello) {
262262
returnowner.destroy(newERR_SOCKET_CLOSED());
263263

264264
owner._handle.loadSession(session);
265-
// Session is loaded. End the parser to allow handshaking to continue.
266-
owner._handle.endParser();
265+
// Session is loaded. Let the handshake continue.
266+
owner._handle.clientHelloDone();
267267
}
268268

269269
if(hello.sessionId.length<=0||
@@ -281,8 +281,8 @@ function loadSession(hello) {
281281
// Sessions with tickets can be resumed directly from the ticket, no server
282282
// session storage is necessary.
283283
// Without a call to a resumeSession listener, a session will never be
284-
// loaded, so end the parser to allow handshaking to continue.
285-
owner._handle.endParser();
284+
// loaded, so let the handshake continue.
285+
owner._handle.clientHelloDone();
286286
}
287287
}
288288

@@ -970,7 +970,6 @@ TLSSocket.prototype._init = function(socket, wrap) {
970970
if(this.server){
971971
if(this.server.listenerCount('resumeSession')>0||
972972
this.server.listenerCount('newSession')>0){
973-
// Also starts the client hello parser as a side effect.
974973
ssl.enableSessionCallbacks();
975974
}
976975
if(this.server.listenerCount('OCSPRequest')>0)
‎node.gyp‎
Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@
406406
'src/crypto/crypto_rsa.cc',
407407
'src/crypto/crypto_spkac.cc',
408408
'src/crypto/crypto_util.cc',
409-
'src/crypto/crypto_clienthello.cc',
410409
'src/crypto/crypto_dh.cc',
411410
'src/crypto/crypto_hash.cc',
412411
'src/crypto/crypto_keys.cc',
@@ -416,7 +415,6 @@
416415
'src/crypto/crypto_x509.cc',
417416
'src/crypto/crypto_argon2.h',
418417
'src/crypto/crypto_bio.h',
419-
'src/crypto/crypto_clienthello-inl.h',
420418
'src/crypto/crypto_dh.h',
421419
'src/crypto/crypto_hmac.h',
422420
'src/crypto/crypto_kmac.h',
@@ -432,7 +430,6 @@
432430
'src/crypto/crypto_keygen.h',
433431
'src/crypto/crypto_scrypt.h',
434432
'src/crypto/crypto_tls.h',
435-
'src/crypto/crypto_clienthello.h',
436433
'src/crypto/crypto_context.h',
437434
'src/crypto/crypto_ec.h',
438435
'src/crypto/crypto_pqc.h',
@@ -462,7 +459,6 @@
462459
'src/tracing/trace_event_legacy.h',
463460
 ],
464461
'node_cctest_openssl_sources': [
465-
'test/cctest/test_crypto_clienthello.cc',
466462
'test/cctest/test_node_crypto.cc',
467463
'test/cctest/test_node_crypto_env.cc',
468464
 ],
@@ -1297,54 +1293,6 @@
12971293
 }],
12981294
 ],
12991295
 }, # fuzz_env
1300-
 { # fuzz_ClientHelloParser.cc
1301-
'target_name': 'fuzz_ClientHelloParser',
1302-
'type': 'executable',
1303-
'dependencies': [
1304-
'<(node_lib_target_name)',
1305-
 ],
1306-
'includes': [
1307-
'node.gypi'
1308-
 ],
1309-
'include_dirs': [
1310-
'src',
1311-
'tools/msvs/genfiles',
1312-
'deps/v8/include',
1313-
'deps/cares/include',
1314-
'deps/uv/include',
1315-
'test/cctest',
1316-
 ],
1317-
'defines': [
1318-
'NODE_ARCH="<(target_arch)"',
1319-
'NODE_PLATFORM="<(OS)"',
1320-
'NODE_WANT_INTERNALS=1',
1321-
 ],
1322-
'sources': [
1323-
'test/fuzzers/fuzz_ClientHelloParser.cc',
1324-
 ],
1325-
'conditions': [
1326-
 [ 'node_shared_hdr_histogram=="false"', {
1327-
'dependencies': [
1328-
'deps/histogram/histogram.gyp:histogram',
1329-
 ],
1330-
 }],
1331-
 [ 'node_shared_uvwasi=="false"', {
1332-
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
1333-
'include_dirs': [ 'deps/uvwasi/include' ],
1334-
 }],
1335-
 ['OS=="linux" or OS=="openharmony"', {
1336-
'ldflags': [ '-fsanitize=fuzzer' ]
1337-
 }],
1338-
# Ensure that ossfuzz flag has been set and that we are on Linux
1339-
 [ 'OS not in "linux openharmony" or ossfuzz!="true"', {
1340-
'type': 'none',
1341-
 }],
1342-
# Avoid excessive LTO
1343-
 ['enable_lto=="true"', {
1344-
'ldflags': [ '-fno-lto' ],
1345-
 }],
1346-
 ],
1347-
 }, # fuzz_ClientHelloParser.cc
13481296
 { # fuzz_strings
13491297
'target_name': 'fuzz_strings',
13501298
'type': 'executable',
‎src/crypto/README.md‎
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,26 @@ throughout the rest of the code.
3030
The rest of the files are structured by their function, as detailed in the
3131
following table:
3232

33-
| File (\*.h/\*.cc) | Description |
34-
| -------------------- | -------------------------------------------------------------------------- |
35-
|`crypto_aes`| AES Cipher support. |
36-
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37-
|`crypto_cipher`| General Encryption/Decryption utilities. |
38-
|`crypto_clienthello`| TLS/SSL client hello parser implementation. Used during SSL/TLS handshake. |
39-
|`crypto_context`| Implementation of the `SecureContext` object. |
40-
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
41-
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
42-
|`crypto_ec`| Elliptic-curve cryptography implementation. |
43-
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
44-
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
45-
|`crypto_hmac`| HMAC implementations. |
46-
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
47-
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
48-
|`crypto_rsa`| RSA Key Generation functions. |
49-
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
50-
|`crypto_sig`| General digital signature and verification utilities. |
51-
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
52-
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
53-
|`crypto_timing`| Implementation of the TimingSafeEqual. |
33+
| File (\*.h/\*.cc) | Description |
34+
| ----------------- | -------------------------------------------------------------------- |
35+
|`crypto_aes`| AES Cipher support. |
36+
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37+
|`crypto_cipher`| General Encryption/Decryption utilities. |
38+
|`crypto_context`| Implementation of the `SecureContext` object. |
39+
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
40+
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
41+
|`crypto_ec`| Elliptic-curve cryptography implementation. |
42+
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
43+
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
44+
|`crypto_hmac`| HMAC implementations. |
45+
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
46+
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
47+
|`crypto_rsa`| RSA Key Generation functions. |
48+
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
49+
|`crypto_sig`| General digital signature and verification utilities. |
50+
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
51+
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
52+
|`crypto_timing`| Implementation of the TimingSafeEqual. |
5453

5554
When new crypto protocols are added, they will be added into their own
5655
`crypto_``*.h` and `*.cc` files.
‎src/crypto/crypto_clienthello-inl.h‎
Lines changed: 0 additions & 90 deletions
This file was deleted.
0 commit comments
Comments
 (0)

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

Skip to content
Commit 8f4ee7e
Browse files
pimterryaduh95
pimterry
authored and
aduh95
committed
tls: drop hand-rolled TLS client hello parser
This existed for 'resumeSession', which needed to do an async lookup
though SSL_CTX_sess_set_get_cb is sync-only. Nowadays both OpenSSL &
BoringSSL have an early ClientHello callback for suspend/resume to
handle this properly, so it was redundant, in addition to being
complicated and generally a bit fragile & scary.
This PR switches to use the modern OpenSSL/BoringSSL mechanisms for this
and drops the client hello parser & related infrastructure completely.
In addition, there's a new test here, covering a fixed bug: the hello
parser silently dropped fragmented hellos, which we now do handle
correctly.
Signed-off-by: Tim Perry <pimterry@gmail.com>
PR-URL: #64827
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 2dd7d4c commit 8f4ee7e
14 files changed
Lines changed: 283 additions & 772 deletions
‎lib/internal/tls/wrap.js‎
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ function loadSession(hello) {
262262
returnowner.destroy(newERR_SOCKET_CLOSED());
263263

264264
owner._handle.loadSession(session);
265-
// Session is loaded. End the parser to allow handshaking to continue.
266-
owner._handle.endParser();
265+
// Session is loaded. Let the handshake continue.
266+
owner._handle.clientHelloDone();
267267
}
268268

269269
if(hello.sessionId.length<=0||
@@ -281,8 +281,8 @@ function loadSession(hello) {
281281
// Sessions with tickets can be resumed directly from the ticket, no server
282282
// session storage is necessary.
283283
// Without a call to a resumeSession listener, a session will never be
284-
// loaded, so end the parser to allow handshaking to continue.
285-
owner._handle.endParser();
284+
// loaded, so let the handshake continue.
285+
owner._handle.clientHelloDone();
286286
}
287287
}
288288

@@ -970,7 +970,6 @@ TLSSocket.prototype._init = function(socket, wrap) {
970970
if(this.server){
971971
if(this.server.listenerCount('resumeSession')>0||
972972
this.server.listenerCount('newSession')>0){
973-
// Also starts the client hello parser as a side effect.
974973
ssl.enableSessionCallbacks();
975974
}
976975
if(this.server.listenerCount('OCSPRequest')>0)
‎node.gyp‎
Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@
406406
'src/crypto/crypto_rsa.cc',
407407
'src/crypto/crypto_spkac.cc',
408408
'src/crypto/crypto_util.cc',
409-
'src/crypto/crypto_clienthello.cc',
410409
'src/crypto/crypto_dh.cc',
411410
'src/crypto/crypto_hash.cc',
412411
'src/crypto/crypto_keys.cc',
@@ -416,7 +415,6 @@
416415
'src/crypto/crypto_x509.cc',
417416
'src/crypto/crypto_argon2.h',
418417
'src/crypto/crypto_bio.h',
419-
'src/crypto/crypto_clienthello-inl.h',
420418
'src/crypto/crypto_dh.h',
421419
'src/crypto/crypto_hmac.h',
422420
'src/crypto/crypto_kmac.h',
@@ -432,7 +430,6 @@
432430
'src/crypto/crypto_keygen.h',
433431
'src/crypto/crypto_scrypt.h',
434432
'src/crypto/crypto_tls.h',
435-
'src/crypto/crypto_clienthello.h',
436433
'src/crypto/crypto_context.h',
437434
'src/crypto/crypto_ec.h',
438435
'src/crypto/crypto_pqc.h',
@@ -462,7 +459,6 @@
462459
'src/tracing/trace_event_legacy.h',
463460
 ],
464461
'node_cctest_openssl_sources': [
465-
'test/cctest/test_crypto_clienthello.cc',
466462
'test/cctest/test_node_crypto.cc',
467463
'test/cctest/test_node_crypto_env.cc',
468464
 ],
@@ -1297,54 +1293,6 @@
12971293
 }],
12981294
 ],
12991295
 }, # fuzz_env
1300-
 { # fuzz_ClientHelloParser.cc
1301-
'target_name': 'fuzz_ClientHelloParser',
1302-
'type': 'executable',
1303-
'dependencies': [
1304-
'<(node_lib_target_name)',
1305-
 ],
1306-
'includes': [
1307-
'node.gypi'
1308-
 ],
1309-
'include_dirs': [
1310-
'src',
1311-
'tools/msvs/genfiles',
1312-
'deps/v8/include',
1313-
'deps/cares/include',
1314-
'deps/uv/include',
1315-
'test/cctest',
1316-
 ],
1317-
'defines': [
1318-
'NODE_ARCH="<(target_arch)"',
1319-
'NODE_PLATFORM="<(OS)"',
1320-
'NODE_WANT_INTERNALS=1',
1321-
 ],
1322-
'sources': [
1323-
'test/fuzzers/fuzz_ClientHelloParser.cc',
1324-
 ],
1325-
'conditions': [
1326-
 [ 'node_shared_hdr_histogram=="false"', {
1327-
'dependencies': [
1328-
'deps/histogram/histogram.gyp:histogram',
1329-
 ],
1330-
 }],
1331-
 [ 'node_shared_uvwasi=="false"', {
1332-
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
1333-
'include_dirs': [ 'deps/uvwasi/include' ],
1334-
 }],
1335-
 ['OS=="linux" or OS=="openharmony"', {
1336-
'ldflags': [ '-fsanitize=fuzzer' ]
1337-
 }],
1338-
# Ensure that ossfuzz flag has been set and that we are on Linux
1339-
 [ 'OS not in "linux openharmony" or ossfuzz!="true"', {
1340-
'type': 'none',
1341-
 }],
1342-
# Avoid excessive LTO
1343-
 ['enable_lto=="true"', {
1344-
'ldflags': [ '-fno-lto' ],
1345-
 }],
1346-
 ],
1347-
 }, # fuzz_ClientHelloParser.cc
13481296
 { # fuzz_strings
13491297
'target_name': 'fuzz_strings',
13501298
'type': 'executable',
‎src/crypto/README.md‎
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,26 @@ throughout the rest of the code.
3030
The rest of the files are structured by their function, as detailed in the
3131
following table:
3232

33-
| File (\*.h/\*.cc) | Description |
34-
| -------------------- | -------------------------------------------------------------------------- |
35-
|`crypto_aes`| AES Cipher support. |
36-
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37-
|`crypto_cipher`| General Encryption/Decryption utilities. |
38-
|`crypto_clienthello`| TLS/SSL client hello parser implementation. Used during SSL/TLS handshake. |
39-
|`crypto_context`| Implementation of the `SecureContext` object. |
40-
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
41-
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
42-
|`crypto_ec`| Elliptic-curve cryptography implementation. |
43-
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
44-
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
45-
|`crypto_hmac`| HMAC implementations. |
46-
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
47-
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
48-
|`crypto_rsa`| RSA Key Generation functions. |
49-
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
50-
|`crypto_sig`| General digital signature and verification utilities. |
51-
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
52-
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
53-
|`crypto_timing`| Implementation of the TimingSafeEqual. |
33+
| File (\*.h/\*.cc) | Description |
34+
| ----------------- | -------------------------------------------------------------------- |
35+
|`crypto_aes`| AES Cipher support. |
36+
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37+
|`crypto_cipher`| General Encryption/Decryption utilities. |
38+
|`crypto_context`| Implementation of the `SecureContext` object. |
39+
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
40+
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
41+
|`crypto_ec`| Elliptic-curve cryptography implementation. |
42+
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
43+
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
44+
|`crypto_hmac`| HMAC implementations. |
45+
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
46+
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
47+
|`crypto_rsa`| RSA Key Generation functions. |
48+
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
49+
|`crypto_sig`| General digital signature and verification utilities. |
50+
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
51+
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
52+
|`crypto_timing`| Implementation of the TimingSafeEqual. |
5453

5554
When new crypto protocols are added, they will be added into their own
5655
`crypto_``*.h` and `*.cc` files.
‎src/crypto/crypto_clienthello-inl.h‎
Lines changed: 0 additions & 90 deletions
This file was deleted.
0 commit comments
Comments
 (0)

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

Skip to content
Commit 8f4ee7e
Browse files
pimterryaduh95
pimterry
authored and
aduh95
committed
tls: drop hand-rolled TLS client hello parser
This existed for 'resumeSession', which needed to do an async lookup
though SSL_CTX_sess_set_get_cb is sync-only. Nowadays both OpenSSL &
BoringSSL have an early ClientHello callback for suspend/resume to
handle this properly, so it was redundant, in addition to being
complicated and generally a bit fragile & scary.
This PR switches to use the modern OpenSSL/BoringSSL mechanisms for this
and drops the client hello parser & related infrastructure completely.
In addition, there's a new test here, covering a fixed bug: the hello
parser silently dropped fragmented hellos, which we now do handle
correctly.
Signed-off-by: Tim Perry <pimterry@gmail.com>
PR-URL: #64827
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 2dd7d4c commit 8f4ee7e
14 files changed
Lines changed: 283 additions & 772 deletions
‎lib/internal/tls/wrap.js‎
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ function loadSession(hello) {
262262
returnowner.destroy(newERR_SOCKET_CLOSED());
263263

264264
owner._handle.loadSession(session);
265-
// Session is loaded. End the parser to allow handshaking to continue.
266-
owner._handle.endParser();
265+
// Session is loaded. Let the handshake continue.
266+
owner._handle.clientHelloDone();
267267
}
268268

269269
if(hello.sessionId.length<=0||
@@ -281,8 +281,8 @@ function loadSession(hello) {
281281
// Sessions with tickets can be resumed directly from the ticket, no server
282282
// session storage is necessary.
283283
// Without a call to a resumeSession listener, a session will never be
284-
// loaded, so end the parser to allow handshaking to continue.
285-
owner._handle.endParser();
284+
// loaded, so let the handshake continue.
285+
owner._handle.clientHelloDone();
286286
}
287287
}
288288

@@ -970,7 +970,6 @@ TLSSocket.prototype._init = function(socket, wrap) {
970970
if(this.server){
971971
if(this.server.listenerCount('resumeSession')>0||
972972
this.server.listenerCount('newSession')>0){
973-
// Also starts the client hello parser as a side effect.
974973
ssl.enableSessionCallbacks();
975974
}
976975
if(this.server.listenerCount('OCSPRequest')>0)
‎node.gyp‎
Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@
406406
'src/crypto/crypto_rsa.cc',
407407
'src/crypto/crypto_spkac.cc',
408408
'src/crypto/crypto_util.cc',
409-
'src/crypto/crypto_clienthello.cc',
410409
'src/crypto/crypto_dh.cc',
411410
'src/crypto/crypto_hash.cc',
412411
'src/crypto/crypto_keys.cc',
@@ -416,7 +415,6 @@
416415
'src/crypto/crypto_x509.cc',
417416
'src/crypto/crypto_argon2.h',
418417
'src/crypto/crypto_bio.h',
419-
'src/crypto/crypto_clienthello-inl.h',
420418
'src/crypto/crypto_dh.h',
421419
'src/crypto/crypto_hmac.h',
422420
'src/crypto/crypto_kmac.h',
@@ -432,7 +430,6 @@
432430
'src/crypto/crypto_keygen.h',
433431
'src/crypto/crypto_scrypt.h',
434432
'src/crypto/crypto_tls.h',
435-
'src/crypto/crypto_clienthello.h',
436433
'src/crypto/crypto_context.h',
437434
'src/crypto/crypto_ec.h',
438435
'src/crypto/crypto_pqc.h',
@@ -462,7 +459,6 @@
462459
'src/tracing/trace_event_legacy.h',
463460
 ],
464461
'node_cctest_openssl_sources': [
465-
'test/cctest/test_crypto_clienthello.cc',
466462
'test/cctest/test_node_crypto.cc',
467463
'test/cctest/test_node_crypto_env.cc',
468464
 ],
@@ -1297,54 +1293,6 @@
12971293
 }],
12981294
 ],
12991295
 }, # fuzz_env
1300-
 { # fuzz_ClientHelloParser.cc
1301-
'target_name': 'fuzz_ClientHelloParser',
1302-
'type': 'executable',
1303-
'dependencies': [
1304-
'<(node_lib_target_name)',
1305-
 ],
1306-
'includes': [
1307-
'node.gypi'
1308-
 ],
1309-
'include_dirs': [
1310-
'src',
1311-
'tools/msvs/genfiles',
1312-
'deps/v8/include',
1313-
'deps/cares/include',
1314-
'deps/uv/include',
1315-
'test/cctest',
1316-
 ],
1317-
'defines': [
1318-
'NODE_ARCH="<(target_arch)"',
1319-
'NODE_PLATFORM="<(OS)"',
1320-
'NODE_WANT_INTERNALS=1',
1321-
 ],
1322-
'sources': [
1323-
'test/fuzzers/fuzz_ClientHelloParser.cc',
1324-
 ],
1325-
'conditions': [
1326-
 [ 'node_shared_hdr_histogram=="false"', {
1327-
'dependencies': [
1328-
'deps/histogram/histogram.gyp:histogram',
1329-
 ],
1330-
 }],
1331-
 [ 'node_shared_uvwasi=="false"', {
1332-
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
1333-
'include_dirs': [ 'deps/uvwasi/include' ],
1334-
 }],
1335-
 ['OS=="linux" or OS=="openharmony"', {
1336-
'ldflags': [ '-fsanitize=fuzzer' ]
1337-
 }],
1338-
# Ensure that ossfuzz flag has been set and that we are on Linux
1339-
 [ 'OS not in "linux openharmony" or ossfuzz!="true"', {
1340-
'type': 'none',
1341-
 }],
1342-
# Avoid excessive LTO
1343-
 ['enable_lto=="true"', {
1344-
'ldflags': [ '-fno-lto' ],
1345-
 }],
1346-
 ],
1347-
 }, # fuzz_ClientHelloParser.cc
13481296
 { # fuzz_strings
13491297
'target_name': 'fuzz_strings',
13501298
'type': 'executable',
‎src/crypto/README.md‎
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,26 @@ throughout the rest of the code.
3030
The rest of the files are structured by their function, as detailed in the
3131
following table:
3232

33-
| File (\*.h/\*.cc) | Description |
34-
| -------------------- | -------------------------------------------------------------------------- |
35-
|`crypto_aes`| AES Cipher support. |
36-
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37-
|`crypto_cipher`| General Encryption/Decryption utilities. |
38-
|`crypto_clienthello`| TLS/SSL client hello parser implementation. Used during SSL/TLS handshake. |
39-
|`crypto_context`| Implementation of the `SecureContext` object. |
40-
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
41-
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
42-
|`crypto_ec`| Elliptic-curve cryptography implementation. |
43-
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
44-
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
45-
|`crypto_hmac`| HMAC implementations. |
46-
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
47-
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
48-
|`crypto_rsa`| RSA Key Generation functions. |
49-
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
50-
|`crypto_sig`| General digital signature and verification utilities. |
51-
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
52-
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
53-
|`crypto_timing`| Implementation of the TimingSafeEqual. |
33+
| File (\*.h/\*.cc) | Description |
34+
| ----------------- | -------------------------------------------------------------------- |
35+
|`crypto_aes`| AES Cipher support. |
36+
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37+
|`crypto_cipher`| General Encryption/Decryption utilities. |
38+
|`crypto_context`| Implementation of the `SecureContext` object. |
39+
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
40+
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
41+
|`crypto_ec`| Elliptic-curve cryptography implementation. |
42+
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
43+
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
44+
|`crypto_hmac`| HMAC implementations. |
45+
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
46+
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
47+
|`crypto_rsa`| RSA Key Generation functions. |
48+
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
49+
|`crypto_sig`| General digital signature and verification utilities. |
50+
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
51+
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
52+
|`crypto_timing`| Implementation of the TimingSafeEqual. |
5453

5554
When new crypto protocols are added, they will be added into their own
5655
`crypto_``*.h` and `*.cc` files.
‎src/crypto/crypto_clienthello-inl.h‎
Lines changed: 0 additions & 90 deletions
This file was deleted.
0 commit comments
Comments
 (0)

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

Skip to content
Commit 8f4ee7e
Browse files
pimterryaduh95
pimterry
authored and
aduh95
committed
tls: drop hand-rolled TLS client hello parser
This existed for 'resumeSession', which needed to do an async lookup
though SSL_CTX_sess_set_get_cb is sync-only. Nowadays both OpenSSL &
BoringSSL have an early ClientHello callback for suspend/resume to
handle this properly, so it was redundant, in addition to being
complicated and generally a bit fragile & scary.
This PR switches to use the modern OpenSSL/BoringSSL mechanisms for this
and drops the client hello parser & related infrastructure completely.
In addition, there's a new test here, covering a fixed bug: the hello
parser silently dropped fragmented hellos, which we now do handle
correctly.
Signed-off-by: Tim Perry <pimterry@gmail.com>
PR-URL: #64827
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
1 parent 2dd7d4c commit 8f4ee7e
14 files changed
Lines changed: 283 additions & 772 deletions
‎lib/internal/tls/wrap.js‎
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ function loadSession(hello) {
262262
returnowner.destroy(newERR_SOCKET_CLOSED());
263263

264264
owner._handle.loadSession(session);
265-
// Session is loaded. End the parser to allow handshaking to continue.
266-
owner._handle.endParser();
265+
// Session is loaded. Let the handshake continue.
266+
owner._handle.clientHelloDone();
267267
}
268268

269269
if(hello.sessionId.length<=0||
@@ -281,8 +281,8 @@ function loadSession(hello) {
281281
// Sessions with tickets can be resumed directly from the ticket, no server
282282
// session storage is necessary.
283283
// Without a call to a resumeSession listener, a session will never be
284-
// loaded, so end the parser to allow handshaking to continue.
285-
owner._handle.endParser();
284+
// loaded, so let the handshake continue.
285+
owner._handle.clientHelloDone();
286286
}
287287
}
288288

@@ -970,7 +970,6 @@ TLSSocket.prototype._init = function(socket, wrap) {
970970
if(this.server){
971971
if(this.server.listenerCount('resumeSession')>0||
972972
this.server.listenerCount('newSession')>0){
973-
// Also starts the client hello parser as a side effect.
974973
ssl.enableSessionCallbacks();
975974
}
976975
if(this.server.listenerCount('OCSPRequest')>0)
‎node.gyp‎
Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@
406406
'src/crypto/crypto_rsa.cc',
407407
'src/crypto/crypto_spkac.cc',
408408
'src/crypto/crypto_util.cc',
409-
'src/crypto/crypto_clienthello.cc',
410409
'src/crypto/crypto_dh.cc',
411410
'src/crypto/crypto_hash.cc',
412411
'src/crypto/crypto_keys.cc',
@@ -416,7 +415,6 @@
416415
'src/crypto/crypto_x509.cc',
417416
'src/crypto/crypto_argon2.h',
418417
'src/crypto/crypto_bio.h',
419-
'src/crypto/crypto_clienthello-inl.h',
420418
'src/crypto/crypto_dh.h',
421419
'src/crypto/crypto_hmac.h',
422420
'src/crypto/crypto_kmac.h',
@@ -432,7 +430,6 @@
432430
'src/crypto/crypto_keygen.h',
433431
'src/crypto/crypto_scrypt.h',
434432
'src/crypto/crypto_tls.h',
435-
'src/crypto/crypto_clienthello.h',
436433
'src/crypto/crypto_context.h',
437434
'src/crypto/crypto_ec.h',
438435
'src/crypto/crypto_pqc.h',
@@ -462,7 +459,6 @@
462459
'src/tracing/trace_event_legacy.h',
463460
 ],
464461
'node_cctest_openssl_sources': [
465-
'test/cctest/test_crypto_clienthello.cc',
466462
'test/cctest/test_node_crypto.cc',
467463
'test/cctest/test_node_crypto_env.cc',
468464
 ],
@@ -1297,54 +1293,6 @@
12971293
 }],
12981294
 ],
12991295
 }, # fuzz_env
1300-
 { # fuzz_ClientHelloParser.cc
1301-
'target_name': 'fuzz_ClientHelloParser',
1302-
'type': 'executable',
1303-
'dependencies': [
1304-
'<(node_lib_target_name)',
1305-
 ],
1306-
'includes': [
1307-
'node.gypi'
1308-
 ],
1309-
'include_dirs': [
1310-
'src',
1311-
'tools/msvs/genfiles',
1312-
'deps/v8/include',
1313-
'deps/cares/include',
1314-
'deps/uv/include',
1315-
'test/cctest',
1316-
 ],
1317-
'defines': [
1318-
'NODE_ARCH="<(target_arch)"',
1319-
'NODE_PLATFORM="<(OS)"',
1320-
'NODE_WANT_INTERNALS=1',
1321-
 ],
1322-
'sources': [
1323-
'test/fuzzers/fuzz_ClientHelloParser.cc',
1324-
 ],
1325-
'conditions': [
1326-
 [ 'node_shared_hdr_histogram=="false"', {
1327-
'dependencies': [
1328-
'deps/histogram/histogram.gyp:histogram',
1329-
 ],
1330-
 }],
1331-
 [ 'node_shared_uvwasi=="false"', {
1332-
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
1333-
'include_dirs': [ 'deps/uvwasi/include' ],
1334-
 }],
1335-
 ['OS=="linux" or OS=="openharmony"', {
1336-
'ldflags': [ '-fsanitize=fuzzer' ]
1337-
 }],
1338-
# Ensure that ossfuzz flag has been set and that we are on Linux
1339-
 [ 'OS not in "linux openharmony" or ossfuzz!="true"', {
1340-
'type': 'none',
1341-
 }],
1342-
# Avoid excessive LTO
1343-
 ['enable_lto=="true"', {
1344-
'ldflags': [ '-fno-lto' ],
1345-
 }],
1346-
 ],
1347-
 }, # fuzz_ClientHelloParser.cc
13481296
 { # fuzz_strings
13491297
'target_name': 'fuzz_strings',
13501298
'type': 'executable',
‎src/crypto/README.md‎
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,26 @@ throughout the rest of the code.
3030
The rest of the files are structured by their function, as detailed in the
3131
following table:
3232

33-
| File (\*.h/\*.cc) | Description |
34-
| -------------------- | -------------------------------------------------------------------------- |
35-
|`crypto_aes`| AES Cipher support. |
36-
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37-
|`crypto_cipher`| General Encryption/Decryption utilities. |
38-
|`crypto_clienthello`| TLS/SSL client hello parser implementation. Used during SSL/TLS handshake. |
39-
|`crypto_context`| Implementation of the `SecureContext` object. |
40-
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
41-
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
42-
|`crypto_ec`| Elliptic-curve cryptography implementation. |
43-
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
44-
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
45-
|`crypto_hmac`| HMAC implementations. |
46-
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
47-
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
48-
|`crypto_rsa`| RSA Key Generation functions. |
49-
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
50-
|`crypto_sig`| General digital signature and verification utilities. |
51-
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
52-
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
53-
|`crypto_timing`| Implementation of the TimingSafeEqual. |
33+
| File (\*.h/\*.cc) | Description |
34+
| ----------------- | -------------------------------------------------------------------- |
35+
|`crypto_aes`| AES Cipher support. |
36+
|`crypto_argon2`| Argon2 key / bit generation implementation. |
37+
|`crypto_cipher`| General Encryption/Decryption utilities. |
38+
|`crypto_context`| Implementation of the `SecureContext` object. |
39+
|`crypto_dh`| Diffie-Hellman Key Agreement implementation. |
40+
|`crypto_dsa`| DSA (Digital Signature) Key Generation functions. |
41+
|`crypto_ec`| Elliptic-curve cryptography implementation. |
42+
|`crypto_hash`| Basic hash (e.g. SHA-256) functions. |
43+
|`crypto_hkdf`| HKDF (Key derivation) implementation. |
44+
|`crypto_hmac`| HMAC implementations. |
45+
|`crypto_keys`| Utilities for using and generating secret, private, and public keys. |
46+
|`crypto_pbkdf2`| PBKDF2 key / bit generation implementation. |
47+
|`crypto_rsa`| RSA Key Generation functions. |
48+
|`crypto_scrypt`| Scrypt key / bit generation implementation. |
49+
|`crypto_sig`| General digital signature and verification utilities. |
50+
|`crypto_spkac`| Netscape SPKAC certificate utilities. |
51+
|`crypto_ssl`| Implementation of the `SSLWrap` object. |
52+
|`crypto_timing`| Implementation of the TimingSafeEqual. |
5453

5554
When new crypto protocols are added, they will be added into their own
5655
`crypto_``*.h` and `*.cc` files.
‎src/crypto/crypto_clienthello-inl.h‎
Lines changed: 0 additions & 90 deletions
This file was deleted.
0 commit comments
Comments
 (0)