nodejs
diff --git a/Collapse file
‎src/node_crypto.cc‎
Copy file name to clipboardExpand all lines: src/node_crypto.cc
+1Lines changed: 1 addition & 0 deletions b/Collapse file
‎src/node_crypto.cc‎
Copy file name to clipboardExpand all lines: src/node_crypto.cc
+1Lines changed: 1 addition & 0 deletions
diff --git a/Collapse file
‎test/parallel/test-crypto-ecdh-convert-key.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-crypto-ecdh-convert-key.js
+25-1Lines changed: 25 additions & 1 deletion b/Collapse file
‎test/parallel/test-crypto-ecdh-convert-key.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-crypto-ecdh-convert-key.js
+25-1Lines changed: 25 additions & 1 deletion
@@ -6095,6 +6095,7 @@ void ExportChallenge(const FunctionCallbackInfo<Value>& args) {
 
 // Convert the input public key to compressed, uncompressed, or hybrid formats.
 void ConvertKey(const FunctionCallbackInfo<Value>& args) {
+  MarkPopErrorOnReturn mark_pop_error_on_return;
   Environment* env = Environment::GetCurrent(args);
 
   CHECK_EQ(args.Length(), 3);
 
@@ -5,7 +5,7 @@ if (!common.hasCrypto)
 
 const assert = require('assert');
 
-const { ECDH, getCurves } = require('crypto');
+const { ECDH, createSign, getCurves } = require('crypto');
 
 // A valid private key for the secp256k1 curve.
 const cafebabeKey = 'cafebabe'.repeat(8);
@@ -99,3 +99,27 @@ if (getCurves().includes('secp256k1')) {
   assert.strictEqual(ecdh1.getPublicKey('hex', 'compressed'), compressed);
   assert.strictEqual(ecdh1.getPublicKey('hex', 'hybrid'), hybrid);
 }
+
+// See https://github.com/nodejs/node/issues/26133, failed ConvertKey
+// operations should not leave errors on OpenSSL's error stack because
+// that's observable by subsequent operations.
+{
+  const privateKey =
+    '-----BEGIN EC PRIVATE KEY-----\n' +
+    'MHcCAQEEIF+jnWY1D5kbVYDNvxxo/Y+ku2uJPDwS0r/VuPZQrjjVoAoGCCqGSM49\n' +
+    'AwEHoUQDQgAEurOxfSxmqIRYzJVagdZfMMSjRNNhB8i3mXyIMq704m2m52FdfKZ2\n' +
+    'pQhByd5eyj3lgZ7m7jbchtdgyOF8Io/1ng==\n' +
+    '-----END EC PRIVATE KEY-----';
+
+  const sign = createSign('sha256').update('plaintext');
+
+  // TODO(bnoordhuis) This should really bubble up the specific OpenSSL error
+  // rather than Node's generic error message.
+  const badKey = 'f'.repeat(128);
+  assert.throws(
+    () => ECDH.convertKey(badKey, 'secp256k1', 'hex', 'hex', 'compressed'),
+    /Failed to convert Buffer to EC_POINT/);
+
+  // Next statement should not throw an exception.
+  sign.sign(privateKey);
+}