nodejs
diff --git a/‎deps/ncrypto/ncrypto.cc‎
Lines changed: 7 additions & 1 deletion b/‎deps/ncrypto/ncrypto.cc‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎test/parallel/test-https-snicallback-override.js‎
Lines changed: 71 additions & 0 deletions b/‎test/parallel/test-https-snicallback-override.js‎
Lines changed: 71 additions & 0 deletions
@@ -2973,7 +2973,13 @@ bool SSLPointer::setSniContext(const SSLCtxPointer& ctx) const {
   EVP_PKEY* pkey = SSL_CTX_get0_privatekey(ctx.get());
   STACK_OF(X509) * chain;
   int err = SSL_CTX_get0_chain_certs(ctx.get(), &chain);
-  if (err == 1) err = SSL_use_certificate(get(), x509);
+  if (err == 1) {
+    // SSL_use_certificate replaces only the certificate matching the key
+    // type. Clear all existing certificates so credentials from the default
+    // context cannot be selected for a different key type.
+    SSL_certs_clear(get());
+    err = SSL_use_certificate(get(), x509);
+  }
   if (err == 1) err = SSL_use_PrivateKey(get(), pkey);
   if (err == 1 && chain != nullptr) err = SSL_set1_chain(get(), chain);
   return err == 1;
 
@@ -0,0 +1,71 @@
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const assert = require('assert');
+const { X509Certificate } = require('crypto');
+const https = require('https');
+const tls = require('tls');
+const fixtures = require('../common/fixtures');
+
+const defaultCredentials = {
+  cert: fixtures.readKey('ca5-cert.pem'),
+  key: fixtures.readKey('ca5-key.pem'),
+};
+const sniCredentials = {
+  cert: fixtures.readKey('agent1-cert.pem'),
+  key: fixtures.readKey('agent1-key.pem'),
+};
+
+const defaultCertificate = new X509Certificate(defaultCredentials.cert);
+const sniCertificate = new X509Certificate(sniCredentials.cert);
+const sniContext = tls.createSecureContext(sniCredentials);
+
+function request(port, servername, expectedCertificate) {
+  return new Promise((resolve, reject) => {
+    const req = https.get({
+      host: '127.0.0.1',
+      port,
+      servername,
+      rejectUnauthorized: false,
+      agent: false,
+    }, common.mustCall((response) => {
+      try {
+        const certificate = response.socket.getPeerX509Certificate();
+        assert.strictEqual(certificate.fingerprint256,
+                           expectedCertificate.fingerprint256);
+      } catch (err) {
+        reject(err);
+        return;
+      }
+
+      response.resume();
+      response.once('end', resolve);
+      response.once('error', reject);
+    }));
+    req.once('error', reject);
+  });
+}
+
+const server = https.createServer({
+  cert: defaultCredentials.cert,
+  key: defaultCredentials.key,
+  SNICallback: common.mustCall((servername, callback) => {
+    assert.strictEqual(servername, 'agent1.com');
+    callback(null, sniContext);
+  }, 1),
+}, (_request, response) => {
+  response.end('ok');
+});
+
+server.listen(0, common.mustCall(async () => {
+  try {
+    const { port } = server.address();
+    await request(port, undefined, defaultCertificate);
+    await request(port, 'agent1.com', sniCertificate);
+  } finally {
+    server.close(common.mustCall());
+  }
+}));