LailaTheElf/embassy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected GCM tag generation.

Browse Source
This commit is contained in:
Caleb Garrett 2024-02-20 14:27:37 -05:00
parent 690b2118c6
commit 1e21b758f7
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
embassy-stm32/src/cryp/mod.rs
View File

@ -45,7 +45,7 @@ pub trait Cipher<'c> {
&self, &self,
_p: &pac::cryp::Cryp, _p: &pac::cryp::Cryp,
_dir: Direction, _dir: Direction,
_int_data: &[u8; AES_BLOCK_SIZE], _int_data: &mut [u8; AES_BLOCK_SIZE],
_temp1: [u32; 4], _temp1: [u32; 4],
_padding_mask: [u8; 16], _padding_mask: [u8; 16],
) { ) {
@ -236,16 +236,18 @@ impl<'c, const KEY_SIZE: usize> Cipher<'c> for AesGcm<'c, KEY_SIZE> {
&self, &self,
p: &pac::cryp::Cryp, p: &pac::cryp::Cryp,
dir: Direction, dir: Direction,
int_data: &[u8; AES_BLOCK_SIZE], int_data: &mut [u8; AES_BLOCK_SIZE],
_temp1: [u32; 4], _temp1: [u32; 4],
_padding_mask: [u8; 16], padding_mask: [u8; AES_BLOCK_SIZE],
) { ) {
if dir == Direction::Encrypt { if dir == Direction::Encrypt {
//Handle special GCM partial block process. //Handle special GCM partial block process.
p.cr().modify(|w| w.set_crypen(false)); p.cr().modify(|w| w.set_crypen(false));
p.cr().write(|w| w.set_algomode3(true)); p.cr().modify(|w| w.set_algomode3(true));
p.cr().write(|w| w.set_algomode0(0)); p.cr().modify(|w| w.set_algomode0(0));
p.init(1).ivrr().write_value(2); for i in 0..AES_BLOCK_SIZE {
int_data[i] = int_data[i] & padding_mask[i];
}
p.cr().modify(|w| w.set_crypen(true)); p.cr().modify(|w| w.set_crypen(true));
p.cr().modify(|w| w.set_gcm_ccmph(3)); p.cr().modify(|w| w.set_gcm_ccmph(3));
let mut index = 0; let mut index = 0;
@ -323,7 +325,7 @@ impl<'c, const KEY_SIZE: usize> Cipher<'c> for AesGmac<'c, KEY_SIZE> {
&self, &self,
p: &pac::cryp::Cryp, p: &pac::cryp::Cryp,
dir: Direction, dir: Direction,
int_data: &[u8; AES_BLOCK_SIZE], int_data: &mut [u8; AES_BLOCK_SIZE],
_temp1: [u32; 4], _temp1: [u32; 4],
_padding_mask: [u8; 16], _padding_mask: [u8; 16],
) { ) {
@ -493,7 +495,7 @@ impl<'c, const KEY_SIZE: usize> Cipher<'c> for AesCcm<'c, KEY_SIZE> {
&self, &self,
p: &pac::cryp::Cryp, p: &pac::cryp::Cryp,
dir: Direction, dir: Direction,
int_data: &[u8; AES_BLOCK_SIZE], int_data: &mut [u8; AES_BLOCK_SIZE],
temp1: [u32; 4], temp1: [u32; 4],
padding_mask: [u8; 16], padding_mask: [u8; 16],
) { ) {
@ -872,7 +874,7 @@ impl<'d, T: Instance> Cryp<'d, T> {
let mut mask: [u8; 16] = [0; 16]; let mut mask: [u8; 16] = [0; 16];
mask[..last_block_remainder].fill(0xFF); mask[..last_block_remainder].fill(0xFF);
ctx.cipher ctx.cipher
.post_final_block(&T::regs(), ctx.dir, &intermediate_data, temp1, mask); .post_final_block(&T::regs(), ctx.dir, &mut intermediate_data, temp1, mask);
} }
ctx.payload_len += input.len() as u64; ctx.payload_len += input.len() as u64;