foster/denoland-deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-02-12 16:59:32 -05:00
Code Issues Packages 1 Wiki Activity

fix(ext/node): fix panic when invalid AES GCM key size (#27818)

Browse source 
Fixes https://github.com/denoland/deno/issues/27807
This commit is contained in:
Divy Srivastava 2025-01-27 16:32:25 +05:30 • committed by Bartek Iwańczuk
parent 2f13542b69
commit 2b27d342d8
No known key found for this signature in database
GPG key ID: 0C6BCDDC3B3AD750
2 changed files with 46 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@ use aes::cipher::block_padding::Pkcs7;
use aes::cipher::BlockDecryptMut;
use aes::cipher::BlockEncryptMut;
use aes::cipher::KeyIvInit;
use aes::cipher::KeySizeUser;
use deno_core::Resource;
use digest::generic_array::GenericArray;
use digest::KeyInit;
@ -190,12 +191,20 @@ impl Cipher {
"aes-192-ecb" => Aes192Ecb(Box::new(ecb::Encryptor::new(key.into()))),
"aes-256-ecb" => Aes256Ecb(Box::new(ecb::Encryptor::new(key.into()))),
"aes-128-gcm" => {
if key.len() != aes::Aes128::key_size() {
return Err(CipherError::InvalidKeyLength);
}
let cipher =
aead_gcm_stream::AesGcm::<aes::Aes128>::new(key.into(), iv);
Aes128Gcm(Box::new(cipher))
}
"aes-256-gcm" => {
if key.len() != aes::Aes256::key_size() {
return Err(CipherError::InvalidKeyLength);
}
let cipher =
aead_gcm_stream::AesGcm::<aes::Aes256>::new(key.into(), iv);
@ -406,12 +415,20 @@ impl Decipher {
"aes-192-ecb" => Aes192Ecb(Box::new(ecb::Decryptor::new(key.into()))),
"aes-256-ecb" => Aes256Ecb(Box::new(ecb::Decryptor::new(key.into()))),
"aes-128-gcm" => {
if key.len() != aes::Aes128::key_size() {
return Err(DecipherError::InvalidKeyLength);
}
let decipher =
aead_gcm_stream::AesGcm::<aes::Aes128>::new(key.into(), iv);
Aes128Gcm(Box::new(decipher))
}
"aes-256-gcm" => {
if key.len() != aes::Aes256::key_size() {
return Err(DecipherError::InvalidKeyLength);
}
let decipher =
aead_gcm_stream::AesGcm::<aes::Aes256>::new(key.into(), iv);

29
tests/unit_node/crypto/crypto_cipher_gcm_test.ts
View file

@ -143,3 +143,32 @@ Deno.test({
);
},
});
Deno.test({
name: "aes gcm with invalid key length",
fn() {
assertThrows(
() => {
crypto.createCipheriv(
"aes-128-gcm",
Buffer.alloc(15),
Buffer.alloc(12),
);
},
Error,
"Invalid key length",
);
assertThrows(
() => {
crypto.createCipheriv(
"aes-256-gcm",
Buffer.alloc(31),
Buffer.alloc(12),
);
},
Error,
"Invalid key length",
);
},
});