suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use JS fallback code for RSA message decryption in Node if PKCS#1 is not supported (#1728)

Browse Source 
Necessary as Node v18.19.1, 20.11.1 and 21.6.2 have disabled support for PKCS#1 decryption.
This commit is contained in:
larabr 2024-02-19 17:14:55 +01:00 committed by GitHub
parent 7a6b41fbd4
commit a4e2c56c49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/crypto/public_key/rsa.js
View File

@ -140,8 +140,15 @@ export async function encrypt(data, n, e) {
* @async * @async
*/ */
export async function decrypt(data, n, e, d, p, q, u, randomPayload) { export async function decrypt(data, n, e, d, p, q, u, randomPayload) {
if (util.getNodeCrypto()) { // Node v18.19.1, 20.11.1 and 21.6.2 have disabled support for PKCS#1 decryption,
return nodeDecrypt(data, n, e, d, p, q, u, randomPayload); // and we want to avoid checking the error type to decide if the random payload
// should indeed be returned.
if (util.getNodeCrypto() && !randomPayload) {
try {
return await nodeDecrypt(data, n, e, d, p, q, u);
} catch (err) {
util.printDebugError(err);
}
} }
return bnDecrypt(data, n, e, d, p, q, u, randomPayload); return bnDecrypt(data, n, e, d, p, q, u, randomPayload);
} }
@ -443,7 +450,7 @@ async function bnEncrypt(data, n, e) {
return data.modExp(e, n).toUint8Array('be', n.byteLength()); return data.modExp(e, n).toUint8Array('be', n.byteLength());
} }
async function nodeDecrypt(data, n, e, d, p, q, u, randomPayload) { async function nodeDecrypt(data, n, e, d, p, q, u) {
const { default: BN } = await import('bn.js'); const { default: BN } = await import('bn.js');
const pBNum = new BN(p); const pBNum = new BN(p);
@ -477,9 +484,6 @@ async function nodeDecrypt(data, n, e, d, p, q, u, randomPayload) {
try { try {
return new Uint8Array(nodeCrypto.privateDecrypt(key, data)); return new Uint8Array(nodeCrypto.privateDecrypt(key, data));
} catch (err) { } catch (err) {
if (randomPayload) {
return randomPayload;
}
throw new Error('Decryption error'); throw new Error('Decryption error');
} }
} }

2
test/general/signature.js
View File

@ -1188,7 +1188,7 @@ Fk7EflUZzngwY4lBzYAfnNBjEjc30xD/ddo+rwE=
], ],
config config
}); });
expect(openpgp.decrypt({ await expect(openpgp.decrypt({
message: await openpgp.readMessage({ armoredMessage: message_with_notation }), message: await openpgp.readMessage({ armoredMessage: message_with_notation }),
decryptionKeys: privKey, decryptionKeys: privKey,
verificationKeys: privKey, verificationKeys: privKey,