foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-21 13:00:36 -05:00
Code Issues Packages 1 Wiki Activity

fix(ext/node): make getCiphers return supported ciphers (#27466)

Browse source 
Currently we only supports 7 ciphers (`aes-(128|192|256)-ecb` and
`aes-(128|256)-(cbc|gcm)`) in `node:crypto`, but `crypto.getCiphers`
returns other supported cipher names. That confuses `npm:openpgp`
package and causes https://github.com/denoland/deno/issues/26875.

This PR makes `getCiphers` return actually supported cipher names.

With this change, the example given in #26875 can create private and
public key files.

closes #26875
This commit is contained in:
Yoshiya Hinosawa 2024-12-26 13:24:28 +09:00 • committed by GitHub
parent a9ab7a80da
commit 91150706d8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/node/ops/crypto/cipher.rs
View file

@ -172,7 +172,7 @@ impl Cipher {
) -> Result<Self, CipherError> { ) -> Result<Self, CipherError> {
use Cipher::*; use Cipher::*;
Ok(match algorithm_name { Ok(match algorithm_name {
"aes-128-cbc" => { "aes128" | "aes-128-cbc" => {
Aes128Cbc(Box::new(cbc::Encryptor::new(key.into(), iv.into()))) Aes128Cbc(Box::new(cbc::Encryptor::new(key.into(), iv.into())))
} }
"aes-128-ecb" => Aes128Ecb(Box::new(ecb::Encryptor::new(key.into()))), "aes-128-ecb" => Aes128Ecb(Box::new(ecb::Encryptor::new(key.into()))),

24
ext/node/polyfills/internal/crypto/util.ts
View file

@ -67,22 +67,16 @@ export const ellipticCurves: Array<EllipticCurve> = [
}, // NIST P-224 EC }, // NIST P-224 EC
]; ];
// deno-fmt-ignore
const supportedCiphers = [ const supportedCiphers = [
"aes-128-ecb", "aes-192-ecb", "aes-128-ecb",
"aes-256-ecb", "aes-128-cbc", "aes-192-ecb",
"aes-192-cbc", "aes-256-cbc", "aes-256-ecb",
"aes128", "aes192", "aes-128-cbc",
"aes256", "aes-128-cfb", "aes-256-cbc",
"aes-192-cfb", "aes-256-cfb", "aes128",
"aes-128-cfb8", "aes-192-cfb8", "aes256",
"aes-256-cfb8", "aes-128-cfb1", "aes-128-gcm",
"aes-192-cfb1", "aes-256-cfb1", "aes-256-gcm",
"aes-128-ofb", "aes-192-ofb",
"aes-256-ofb", "aes-128-ctr",
"aes-192-ctr", "aes-256-ctr",
"aes-128-gcm", "aes-192-gcm",
"aes-256-gcm"
]; ];
export function getCiphers(): string[] { export function getCiphers(): string[] {

13
tests/unit_node/crypto/crypto_cipher_test.ts
View file

@ -361,6 +361,19 @@ Deno.test({
name: "getCiphers", name: "getCiphers",
fn() { fn() {
assertEquals(crypto.getCiphers().includes("aes-128-cbc"), true); assertEquals(crypto.getCiphers().includes("aes-128-cbc"), true);
const getZeroKey = (cipher: string) => zeros(+cipher.match(/\d+/)![0] / 8);
const getZeroIv = (cipher: string) => {
if (cipher.includes("gcm") || cipher.includes("ecb")) {
return zeros(12);
}
return zeros(16);
};
for (const cipher of crypto.getCiphers()) {
crypto.createCipheriv(cipher, getZeroKey(cipher), getZeroIv(cipher))
.final();
}
}, },
}); });