foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-04 01:44:26 -05:00
Code Issues Packages 1 Wiki Activity

fix(ext/node): decipherIv() range error on invalid final block length (#28215)

Browse source 
Fixes https://github.com/denoland/deno/issues/28208
This commit is contained in:
Divy Srivastava 2025-02-21 10:18:38 +05:30 • committed by GitHub
parent 84fabecc9b
commit 648ee8f0e7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 38 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -424,6 +424,9 @@ pub enum DecipherError {
#[class(range)]
#[error("Invalid key length")]
InvalidKeyLength,
#[class(range)]
#[error("Wrong final block length")]
InvalidFinalBlockLength,
#[class(type)]
#[error("Invalid initialization vector")]
InvalidInitializationVector,
@ -444,6 +447,14 @@ pub enum DecipherError {
UnknownCipher(String),
}
macro_rules! assert_block_len {
($input:expr, $len:expr) => {
if $input != $len {
return Err(DecipherError::InvalidFinalBlockLength);
}
};
}
impl Decipher {
fn new(
algorithm_name: &str,
@ -604,7 +615,7 @@ impl Decipher {
match (self, auto_pad) {
(Aes128Cbc(decryptor), true) => {
assert!(input.len() == 16);
assert_block_len!(input.len(), 16);
let _ = (*decryptor)
.decrypt_padded_b2b_mut::<Pkcs7>(input, output)
.map_err(|_| DecipherError::CannotUnpadInputData)?;
@ -618,7 +629,7 @@ impl Decipher {
Ok(())
}
(Aes128Ecb(decryptor), true) => {
assert!(input.len() == 16);
assert_block_len!(input.len(), 16);
let _ = (*decryptor)
.decrypt_padded_b2b_mut::<Pkcs7>(input, output)
.map_err(|_| DecipherError::CannotUnpadInputData)?;
@ -632,7 +643,7 @@ impl Decipher {
Ok(())
}
(Aes192Ecb(decryptor), true) => {
assert!(input.len() == 16);
assert_block_len!(input.len(), 16);
let _ = (*decryptor)
.decrypt_padded_b2b_mut::<Pkcs7>(input, output)
.map_err(|_| DecipherError::CannotUnpadInputData)?;
@ -646,7 +657,7 @@ impl Decipher {
Ok(())
}
(Aes256Ecb(decryptor), true) => {
assert!(input.len() == 16);
assert_block_len!(input.len(), 16);
let _ = (*decryptor)
.decrypt_padded_b2b_mut::<Pkcs7>(input, output)
.map_err(|_| DecipherError::CannotUnpadInputData)?;
@ -682,7 +693,7 @@ impl Decipher {
Err(DecipherError::SetAutoPaddingFalseAes256GcmUnsupported)
}
(Aes256Cbc(decryptor), true) => {
assert!(input.len() == 16);
assert_block_len!(input.len(), 16);
let _ = (*decryptor)
.decrypt_padded_b2b_mut::<Pkcs7>(input, output)
.map_err(|_| DecipherError::CannotUnpadInputData)?;

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

@ -447,3 +447,25 @@ Deno.test({
}
},
});
Deno.test({
name: "createDecipheriv - invalid final block len",
fn() {
const algorithm = "aes-256-cbc";
const key = Buffer.from(
"84dcdd964968734fdf0de4a2cba471c2e0a753930b841c014b1e77f456b5797b",
"hex",
);
const iv = Buffer.alloc(16, 0);
const decipher = crypto.createDecipheriv(algorithm, key, iv);
decipher.update(Buffer.alloc(12));
assertThrows(
() => {
decipher.final();
},
RangeError,
"Wrong final block length",
);
},
});