mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
that was a long walk for a drink of water: cbc encryption
Woo? we have CBC encryption using Rust's most favored AES library now. I have a feeling I'm going to be re-doing all of this once they decide to finally take GenericArray out back and shoot it....
This commit is contained in:
parent
798eafeb75
commit
723b230a39
1 changed files with 27 additions and 7 deletions
|
|
@ -28,23 +28,43 @@
|
||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
use aes::cipher::{BlockDecryptMut, BlockEncryptMut, KeyIvInit,
|
use aes::cipher::{BlockDecryptMut, BlockEncryptMut, KeyIvInit,
|
||||||
generic_array::GenericArray, Key, Iv};
|
generic_array::GenericArray, Key, Iv, consts::U16};
|
||||||
|
|
||||||
type Aes256CbcEnc = cbc::Encryptor<aes::Aes256>;
|
type Aes256CbcEnc = cbc::Encryptor<aes::Aes256>;
|
||||||
type Aes256CbcDec = cbc::Decryptor<aes::Aes256>;
|
type Aes256CbcDec = cbc::Decryptor<aes::Aes256>;
|
||||||
|
|
||||||
use super::util::Block16;
|
use super::util::Block16;
|
||||||
|
|
||||||
pub fn cbc_encrypt(key: &[u8; 32], mut iv: Block16, blocks: &mut [Block16])
|
pub fn cbc_encrypt(key: &[u8; 32], iv: Block16, blocks: &mut [Block16])
|
||||||
{
|
{
|
||||||
Aes256CbcEnc::new(Key::from_slice(key), Iv::from_slice(&iv))
|
// we get a mut slice of Block16 which is a [u8; 16], and we want a mut slice
|
||||||
.encrypt_blocks_mut(blocks);
|
// of GenericArray::<u8, U16>. Unfortunately, I don't think there is any way
|
||||||
|
// to do this transformation except either something awful and unsafe, or,
|
||||||
|
// making a heap allocated copy into and out of the structures. Since the
|
||||||
|
// data handled by the authenticator is small, and we value correctness,
|
||||||
|
// we are going to go the inefficient-but-safe route.
|
||||||
|
let mut ga = vec![];
|
||||||
|
for block in blocks.iter() {
|
||||||
|
ga.push(GenericArray::<u8, U16>::clone_from_slice(block));
|
||||||
|
}
|
||||||
|
Aes256CbcEnc::new(Key::<Aes256CbcEnc>::from_slice(key), Iv::<Aes256CbcEnc>::from_slice(&iv))
|
||||||
|
.encrypt_blocks_mut(&mut ga);
|
||||||
|
for (src, dst) in ga.iter().zip(blocks.iter_mut()) {
|
||||||
|
dst.copy_from_slice(src.as_slice());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn cbc_decrypt(key: &[u8; 32], mut iv: Block16, blocks: &mut [Block16])
|
pub fn cbc_decrypt(key: &[u8; 32], iv: Block16, blocks: &mut [Block16])
|
||||||
{
|
{
|
||||||
Aes256CbcDec::new(&key.into(), &iv.into())
|
let mut ga = vec![];
|
||||||
.decrypt_blocks_mut(blocks);
|
for block in blocks.iter() {
|
||||||
|
ga.push(GenericArray::<u8, U16>::clone_from_slice(block));
|
||||||
|
}
|
||||||
|
Aes256CbcDec::new(Key::<Aes256CbcDec>::from_slice(key), Iv::<Aes256CbcDec>::from_slice(&iv))
|
||||||
|
.decrypt_blocks_mut(&mut ga);
|
||||||
|
for (src, dst) in ga.iter().zip(blocks.iter_mut()) {
|
||||||
|
dst.copy_from_slice(src.as_slice());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue