GeezerVison is showing github.com — crypto: clear openssl error stack after en/decrypt · nodejs/node@d192516
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: src/node_crypto.cc +1-2Lines changed: 1 addition & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -5011,6 +5011,7 @@ template <PublicKeyCipher::Operation operation, |
5011 | 5011 | PublicKeyCipher::EVP_PKEY_cipher_init_t EVP_PKEY_cipher_init, |
5012 | 5012 | PublicKeyCipher::EVP_PKEY_cipher_t EVP_PKEY_cipher> |
5013 | 5013 | void PublicKeyCipher::Cipher(const FunctionCallbackInfo<Value>& args) { |
| 5014 | + MarkPopErrorOnReturn mark_pop_error_on_return; |
5014 | 5015 | Environment* env = Environment::GetCurrent(args); |
5015 | 5016 |
|
5016 | 5017 | unsigned int offset = 0; |
@@ -5041,8 +5042,6 @@ void PublicKeyCipher::Cipher(const FunctionCallbackInfo<Value>& args) { |
5041 | 5042 |
|
5042 | 5043 | AllocatedBuffer out; |
5043 | 5044 |
|
5044 | | - ClearErrorOnReturn clear_error_on_return; |
5045 | | - |
5046 | 5045 | bool r = Cipher<operation, EVP_PKEY_cipher_init, EVP_PKEY_cipher>( |
5047 | 5046 | env, |
5048 | 5047 | pkey, |
|
Collapse file
Copy file name to clipboard +38Lines changed: 38 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
| 1 | +'use strict'; |
| 2 | + |
| 3 | +// Verify that privateDecrypt() does not leave an error on the |
| 4 | +// openssl error stack that is visible to subsequent operations. |
| 5 | + |
| 6 | +const common = require('../common'); |
| 7 | +if (!common.hasCrypto) |
| 8 | + common.skip('missing crypto'); |
| 9 | + |
| 10 | +const assert = require('assert'); |
| 11 | +const { |
| 12 | + generateKeyPairSync, |
| 13 | + publicEncrypt, |
| 14 | + privateDecrypt, |
| 15 | +} = require('crypto'); |
| 16 | + |
| 17 | +const pair = generateKeyPairSync('rsa', { modulusLength: 512 }); |
| 18 | + |
| 19 | +const expected = Buffer.from('shibboleth'); |
| 20 | +const encrypted = publicEncrypt(pair.publicKey, expected); |
| 21 | + |
| 22 | +const pkey = pair.privateKey.export({ type: 'pkcs1', format: 'pem' }); |
| 23 | +const pkeyEncrypted = |
| 24 | + pair.privateKey.export({ |
| 25 | + type: 'pkcs1', |
| 26 | + format: 'pem', |
| 27 | + cipher: 'aes128', |
| 28 | + passphrase: 'secret', |
| 29 | + }); |
| 30 | + |
| 31 | +function decrypt(key) { |
| 32 | + const decrypted = privateDecrypt(key, encrypted); |
| 33 | + assert.deepStrictEqual(decrypted, expected); |
| 34 | +} |
| 35 | + |
| 36 | +decrypt(pkey); |
| 37 | +assert.throws(() => decrypt(pkeyEncrypted), { code: 'ERR_MISSING_PASSPHRASE' }); |
| 38 | +decrypt(pkey); // Should not throw. |