Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkcs5: add support for using AES-GCM in PBES2 #1433

Merged
merged 9 commits into from
Jun 15, 2024
Merged

pkcs5: add support for using AES-GCM in PBES2 #1433

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
17c86a9
Add support for using GCM in PBES2
randombit Jun 12, 2024
e95bb01
Fix fmt and cargo lints
randombit Jun 13, 2024
6a26b04
Rename GCM param from iv to nonce
randombit Jun 13, 2024
c5280f3
Make GCM encryption/decryption generic over the cipher
randombit Jun 14, 2024
3222d46
Use U12 for where clause
randombit Jun 14, 2024
603bbb4
Apply suggestion from review
randombit Jun 14, 2024
fc5ee24
Fix a clippy
randombit Jun 14, 2024
67ebe39
Apply suggestions from code review
randombit Jun 14, 2024
f410914
Fix typo, and fmt
randombit Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 24 additions & 30 deletions pkcs5/src/pbes2/encryption.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,61 +49,55 @@ fn cbc_decrypt<'a, C: BlockCipherDecrypt + BlockCipher + KeyInit>(
.map_err(|_| Error::EncryptFailed)
}

fn gcm_encrypt<'a, C>(
fn gcm_encrypt<'a, C, NonceSize, TagSize>(
es: EncryptionScheme,
key: EncryptionKey,
iv: &[u8],
nonce: Nonce<NonceSize>,
buffer: &'a mut [u8],
pos: usize,
) -> Result<&'a [u8]>
where
C: BlockCipher + BlockSizeUser<BlockSize = U16> + GcmKeyInit + BlockCipherEncrypt,
aes_gcm::AesGcm<C, U12>: GcmKeyInit,
aes_gcm::AesGcm<C, NonceSize, TagSize>: GcmKeyInit,
TagSize: aes_gcm::TagSize,
NonceSize: aes::cipher::ArraySize,
{
const TAG_SIZE: usize = 16;
const NONCE_SIZE: usize = 12;

if buffer.len() < TAG_SIZE + pos {
if buffer.len() < TagSize::USIZE + pos {
return Err(Error::EncryptFailed);
}
let gcm = <aes_gcm::AesGcm<C, U12> as GcmKeyInit>::new_from_slice(key.as_slice())
.map_err(|_| es.to_alg_params_invalid())?;
let nonce: [u8; NONCE_SIZE] = iv.try_into().map_err(|_| es.to_alg_params_invalid())?;
let nonce = Nonce::from(nonce);
let gcm =
<aes_gcm::AesGcm<C, NonceSize, TagSize> as GcmKeyInit>::new_from_slice(key.as_slice())
.map_err(|_| es.to_alg_params_invalid())?;
let tag = gcm
.encrypt_in_place_detached(&nonce, &[], &mut buffer[..pos])
.map_err(|_| Error::EncryptFailed)?;
buffer[pos..].copy_from_slice(tag.as_ref());
Ok(&buffer[0..pos + TAG_SIZE])
Ok(&buffer[0..pos + TagSize::USIZE])
}

fn gcm_decrypt<'a, C>(
fn gcm_decrypt<'a, C, NonceSize, TagSize>(
es: EncryptionScheme,
key: EncryptionKey,
iv: &[u8],
nonce: Nonce<NonceSize>,
buffer: &'a mut [u8],
) -> Result<&'a [u8]>
where
C: BlockCipher + BlockSizeUser<BlockSize = U16> + GcmKeyInit + BlockCipherEncrypt,
aes_gcm::AesGcm<C, U12>: GcmKeyInit,
randombit marked this conversation as resolved.
Show resolved Hide resolved
TagSize: aes_gcm::TagSize,
NonceSize: aes::cipher::ArraySize,
{
const TAG_SIZE: usize = 16;
const NONCE_SIZE: usize = 12;

let msg_len = if buffer.len() < TAG_SIZE {
let msg_len = if buffer.len() < TagSize::USIZE {
return Err(Error::DecryptFailed);
} else {
buffer.len() - TAG_SIZE
buffer.len() - TagSize::USIZE
};

let gcm = <aes_gcm::AesGcm<C, U12> as GcmKeyInit>::new_from_slice(key.as_slice())
let gcm = <aes_gcm::AesGcm<C, NonceSize> as GcmKeyInit>::new_from_slice(key.as_slice())
randombit marked this conversation as resolved.
Show resolved Hide resolved
.map_err(|_| es.to_alg_params_invalid())?;
let nonce: [u8; NONCE_SIZE] = iv.try_into().map_err(|_| es.to_alg_params_invalid())?;
let nonce = Nonce::from(nonce);
let tag: [u8; TAG_SIZE] = buffer[msg_len..]
.try_into()
.map_err(|_| Error::DecryptFailed)?;
let tag = Tag::from(tag);

let tag = Tag::try_from(&buffer[msg_len..]).map_err(|_| Error::DecryptFailed)?;

if gcm
.decrypt_in_place_detached(&nonce, &[], &mut buffer[..msg_len], &tag)
.is_err()
Expand Down Expand Up @@ -132,10 +126,10 @@ pub fn encrypt_in_place<'b>(
EncryptionScheme::Aes192Cbc { iv } => cbc_encrypt::<aes::Aes192Enc>(es, key, &iv, buf, pos),
EncryptionScheme::Aes256Cbc { iv } => cbc_encrypt::<aes::Aes256Enc>(es, key, &iv, buf, pos),
EncryptionScheme::Aes128Gcm { nonce } => {
gcm_encrypt::<aes::Aes128Enc>(es, key, &nonce, buf, pos)
gcm_encrypt::<aes::Aes128Enc, U12, U16>(es, key, Nonce::from(nonce), buf, pos)
}
EncryptionScheme::Aes256Gcm { nonce } => {
gcm_encrypt::<aes::Aes256Enc>(es, key, &nonce, buf, pos)
gcm_encrypt::<aes::Aes256Enc, U12, U16>(es, key, Nonce::from(nonce), buf, pos)
}
#[cfg(feature = "3des")]
EncryptionScheme::DesEde3Cbc { iv } => cbc_encrypt::<des::TdesEde3>(es, key, &iv, buf, pos),
Expand All @@ -160,10 +154,10 @@ pub fn decrypt_in_place<'a>(
EncryptionScheme::Aes192Cbc { iv } => cbc_decrypt::<aes::Aes192Dec>(es, key, &iv, buf),
EncryptionScheme::Aes256Cbc { iv } => cbc_decrypt::<aes::Aes256Dec>(es, key, &iv, buf),
EncryptionScheme::Aes128Gcm { nonce } => {
gcm_decrypt::<aes::Aes128Enc>(es, key, &nonce, buf)
gcm_decrypt::<aes::Aes128Enc, U12, U16>(es, key, Nonce::from(nonce), buf)
}
EncryptionScheme::Aes256Gcm { nonce } => {
gcm_decrypt::<aes::Aes256Enc>(es, key, &nonce, buf)
gcm_decrypt::<aes::Aes256Enc, U12, U16>(es, key, Nonce::from(nonce), buf)
}
#[cfg(feature = "3des")]
EncryptionScheme::DesEde3Cbc { iv } => cbc_decrypt::<des::TdesEde3>(es, key, &iv, buf),
Expand Down
Loading