yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AES-GCM: DRY Iv -> Block conversion.

Browse Source
This commit is contained in:
Brian Smith 2023-10-11 10:56:01 -07:00
parent e6085e717f
commit faf347a24c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/aead/aes.rs
View File

@ -202,7 +202,7 @@ impl Key {
#[inline] #[inline]
pub fn encrypt_iv_xor_block(&self, iv: Iv, input: Block) -> Block { pub fn encrypt_iv_xor_block(&self, iv: Iv, input: Block) -> Block {
let encrypted_iv = self.encrypt_block(Block::from(iv.as_bytes_less_safe())); let encrypted_iv = self.encrypt_block(iv.into_block_less_safe());
encrypted_iv ^ input encrypted_iv ^ input
} }
@ -355,8 +355,10 @@ impl From<Counter> for Iv {
} }
impl Iv { impl Iv {
pub(super) fn as_bytes_less_safe(&self) -> &[u8; 16] { /// "Less safe" because it defeats attempts to use the type system to prevent reuse of the IV.
self.0.as_byte_array() #[inline]
pub(super) fn into_block_less_safe(self) -> Block {
Block::from(self.0.as_byte_array())
} }
} }

2
src/aead/aes_gcm.rs
View File

@ -251,7 +251,7 @@ fn finish(
// Finalize the tag and return it. // Finalize the tag and return it.
gcm_ctx.pre_finish(|pre_tag| { gcm_ctx.pre_finish(|pre_tag| {
let encrypted_iv = aes_key.encrypt_block(Block::from(tag_iv.as_bytes_less_safe())); let encrypted_iv = aes_key.encrypt_block(tag_iv.into_block_less_safe());
let tag = pre_tag ^ encrypted_iv; let tag = pre_tag ^ encrypted_iv;
Tag(*tag.as_ref()) Tag(*tag.as_ref())
}) })