tls: close_notify on end(), injected-socket upgrades, reject-handshake wire fix, duplex data-loss, SNI, ALPN (+14 tests, tls 81%→86%)

.claude/commands/upgrade-boringssl.md

@@ -45,7 +45,7 @@ In the bun repo:
 
 - `scripts/build/deps/boringssl.ts` — set `BORINGSSL_COMMIT` to `$NEW_SHA`.
 - `test/js/node/process/process.test.js` — update the `boringssl:` entry in `expectedVersions` to `$NEW_SHA`.
-- `src/js/node/tls.ts` — two hand-maintained mirrors of BoringSSL tables must be re-derived from the new pin (a test pins the current set, but cannot see upstream additions on its own): `_VALID_CIPHERS_SET` ← `ssl/ssl_cipher.cc` `kCiphers`, `CIPHER_LIST_SELECTORS` ← `ssl/ssl_cipher.cc` `kCipherAliases`.
+- `src/js/node/tls.ts` — three hand-maintained mirrors of BoringSSL tables must be re-derived from the new pin (a test pins the current set, but cannot see upstream additions on its own): `SUPPORTED_ECDH_GROUPS` ← `ssl/ssl_key_share.cc` `kNamedGroups` (every `name` and non-empty `alias`), `_VALID_CIPHERS_SET` ← `ssl/ssl_cipher.cc` `kCiphers`, `CIPHER_LIST_SELECTORS` ← `ssl/ssl_cipher.cc` `kCipherAliases`.
 - Regenerate the source lists (the file's header comment has the exact one-liner). Only `gen/sources.json` is authoritative — diff old vs new and apply the delta:
 
   ```sh

packages/bun-usockets/src/libusockets.h

@@ -422,6 +422,12 @@ void us_listen_socket_on_server_name(struct us_listen_socket_t *ls,
  * after the socket closed (no-op). */
 void us_socket_sni_resolve(us_socket_r s, struct ssl_ctx_st *ctx, int error);
 void *us_socket_server_name_userdata(us_socket_r s);
+/* Socket-level SNI resolver, for a server-side socket adopted into TLS with no
+ * listen socket behind it. Same contract as the listener resolver: an owned
+ * SSL_CTX ref or NULL; *abort_handshake 1 = drop silently, 2 = suspend. */
+typedef struct ssl_ctx_st *(*us_socket_server_name_cb)(struct us_socket_t *socket,
+    const char *hostname, int *abort_handshake);
+void us_socket_on_server_name(us_socket_r s, us_socket_server_name_cb cb);
 
 /* ── Connect ──────────────────────────────────────────────────────────────
  * Returns either us_socket_t* (fast path, *is_connecting=1) or
@@ -500,6 +506,8 @@ struct us_bun_socket_context_options_t {
     /* Colon-separated signature algorithm list applied via
      * SSL_CTX_set1_sigalgs_list. */
     const char *sigalgs;
+    /* Colon-separated named-group list applied via SSL_CTX_set1_groups_list. */
+    const char *ecdh_curve;
 };
 
 enum create_bun_socket_error_t {
@@ -509,6 +517,7 @@ enum create_bun_socket_error_t {
     CREATE_BUN_SOCKET_ERROR_INVALID_CA,
     CREATE_BUN_SOCKET_ERROR_INVALID_CIPHERS,
     CREATE_BUN_SOCKET_ERROR_INVALID_CRL,
+    CREATE_BUN_SOCKET_ERROR_INVALID_ECDH_CURVE,
 };
 
 /* Build an SSL_CTX from options. Returns the BoringSSL SSL_CTX*; caller owns

packages/bun-uws/src/App.h

@@ -85,6 +85,7 @@ namespace uWS {
         unsigned int crl_count = 0;
         int allow_partial_trust_chain = 0;
         const char *sigalgs = nullptr;
+        const char *ecdh_curve = nullptr;
 
         /* Conversion operator used internally */
         operator struct us_bun_socket_context_options_t() const {

src/http/HTTPContext.rs

@@ -491,7 +491,11 @@ impl<const SSL: bool> HTTPContext<SSL> {
                     uws::create_bun_socket_error_t::invalid_ca_file => InitError::InvalidCAFile,
                     uws::create_bun_socket_error_t::invalid_ca => InitError::InvalidCA,
                     uws::create_bun_socket_error_t::invalid_crl => InitError::InvalidCRL,
-                    _ => InitError::FailedToOpenSocket,
+                    uws::create_bun_socket_error_t::none
+                    | uws::create_bun_socket_error_t::invalid_ciphers
+                    | uws::create_bun_socket_error_t::invalid_ecdh_curve => {
+                        InitError::FailedToOpenSocket
+                    }
                 });
             }
         };

src/http/ssl_config.rs

@@ -38,6 +38,7 @@ pub struct SSLConfig {
     pub session_timeout: i32,
     pub allow_partial_trust_chain: bool,
     pub sigalgs: CStrPtr,
+    pub ecdh_curve: CStrPtr,
     /// Minimum/maximum TLS protocol version (TLS1_VERSION..TLS1_3_VERSION); 0 = unset/default.
     pub ssl_min_version: i32,
     pub ssl_max_version: i32,
@@ -114,6 +115,7 @@ impl SSLConfig {
         session_timeout: 0,
         allow_partial_trust_chain: false,
         sigalgs: core::ptr::null(),
+        ecdh_curve: core::ptr::null(),
         ssl_min_version: 0,
         ssl_max_version: 0,
         request_cert: 0,
@@ -223,6 +225,9 @@ impl SSLConfig {
         if !self.sigalgs.is_null() {
             ctx_opts.sigalgs = self.sigalgs;
         }
+        if !self.ecdh_curve.is_null() {
+            ctx_opts.ecdh_curve = self.ecdh_curve;
+        }
         if let Some(crl) = &self.crl {
             ctx_opts.crl = crl.as_ptr();
             ctx_opts.crl_count = crl.len() as u32;
@@ -299,6 +304,7 @@ impl SSLConfig {
             return false;
         }
         eq_cstr!(sigalgs);
+        eq_cstr!(ecdh_curve);
         if self.ssl_min_version != other.ssl_min_version {
             return false;
         }
@@ -373,6 +379,7 @@ impl SSLConfig {
         hasher.update(&self.session_timeout.to_ne_bytes());
         hasher.update(&[self.allow_partial_trust_chain as u8]);
         hash_cstr!(sigalgs);
+        hash_cstr!(ecdh_curve);
         hasher.update(&self.ssl_min_version.to_ne_bytes());
         hasher.update(&self.ssl_max_version.to_ne_bytes());
         hasher.update(&self.request_cert.to_ne_bytes());
@@ -413,6 +420,7 @@ impl SSLConfig {
         free_strings(&mut self.ca);
         free_strings(&mut self.crl);
         free_string(&mut self.sigalgs);
+        free_string(&mut self.ecdh_curve);
         free_string(&mut self.ssl_ciphers);
         free_string(&mut self.protos);
     }
@@ -470,6 +478,7 @@ impl Clone for SSLConfig {
             session_timeout: self.session_timeout,
             allow_partial_trust_chain: self.allow_partial_trust_chain,
             sigalgs: clone_string(self.sigalgs),
+            ecdh_curve: clone_string(self.ecdh_curve),
             ssl_min_version: self.ssl_min_version,
             ssl_max_version: self.ssl_max_version,
             request_cert: self.request_cert,

src/js/internal/net/symbols.ts

@@ -1,4 +1,7 @@
 export default {
   kArmHandshakeTimeout: Symbol("kArmHandshakeTimeout"),
+  // Internal handshake-settled signal: server-side sockets emit no user
+  // 'secureConnect' (node parity), so internal deferrals park on this instead.
+  kSecureConnectDone: Symbol("kSecureConnectDone"),
   kVerifyError: Symbol("kVerifyError"),
 };

src/js/internal/test/binding.ts

@@ -65,6 +65,10 @@ function internalBinding(name: string) {
       return { UDP: require("internal/dgram").UDP };
     case "tcp_wrap":
       return { TCP: TestTCPWrap, constants: { SOCKET: 0, SERVER: 1 } };
+    case "cares_wrap":
+      // Only the pure IP-normalizer the vendored tls/dns tests reach for; the
+      // resolver surface lives in node:dns.
+      return { canonicalizeIP: require("bun:internal-for-testing").canonicalizeIP };
     default:
       throw new Error(`internalBinding("${name}") is not implemented in Bun`);
   }

src/js/node/_tls_common.ts

@@ -1,4 +1,10 @@
 // Hardcoded module "node:_tls_common"
+// Deprecated shim mirroring node's lib/_tls_common.js: re-exports the real
+// implementations and warns on load.
+// https://github.com/nodejs/node/blob/v26.3.0/lib/_tls_common.js
+const { SecureContext, createSecureContext } = require("node:tls");
+
+process.emitWarning("The _tls_common module is deprecated. Use `node:tls` instead.", "DeprecationWarning", "DEP0192");
 
 // Translate some fields from the handle's C-friendly format into more idiomatic
 // javascript object representations before passing them back to the user.  Can
@@ -31,5 +37,7 @@ function translatePeerCertificate(c) {
 }
 
 export default {
+  SecureContext,
+  createSecureContext,
   translatePeerCertificate,
 };