-
Notifications
You must be signed in to change notification settings - Fork 29.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
crypto: clear openssl error stack after en/decrypt
The publicEncrypt/privateDecrypt/etc. family of functions didn't clear OpenSSL's error stack on early return. Notably, trying to use an encrypted key with the wrong passphrase left an error on the stack that made subsequent encrypt or decrypt operations fail, even with an unencrypted key. Fixes: #32240 PR-URL: #32248 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
- Loading branch information
1 parent
191cde0
commit d192516
Showing
2 changed files
with
39 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
'use strict'; | ||
|
||
// Verify that privateDecrypt() does not leave an error on the | ||
// openssl error stack that is visible to subsequent operations. | ||
|
||
const common = require('../common'); | ||
if (!common.hasCrypto) | ||
common.skip('missing crypto'); | ||
|
||
const assert = require('assert'); | ||
const { | ||
generateKeyPairSync, | ||
publicEncrypt, | ||
privateDecrypt, | ||
} = require('crypto'); | ||
|
||
const pair = generateKeyPairSync('rsa', { modulusLength: 512 }); | ||
|
||
const expected = Buffer.from('shibboleth'); | ||
const encrypted = publicEncrypt(pair.publicKey, expected); | ||
|
||
const pkey = pair.privateKey.export({ type: 'pkcs1', format: 'pem' }); | ||
const pkeyEncrypted = | ||
pair.privateKey.export({ | ||
type: 'pkcs1', | ||
format: 'pem', | ||
cipher: 'aes128', | ||
passphrase: 'secret', | ||
}); | ||
|
||
function decrypt(key) { | ||
const decrypted = privateDecrypt(key, encrypted); | ||
assert.deepStrictEqual(decrypted, expected); | ||
} | ||
|
||
decrypt(pkey); | ||
assert.throws(() => decrypt(pkeyEncrypted), { code: 'ERR_MISSING_PASSPHRASE' }); | ||
decrypt(pkey); // Should not throw. |