sim: Dependency updates
Update the dependencies in the main sim to the latest versions. There
are some minor changes in a few of the packages, and a fairly
significant change to the aes. The aes_ctr crate has been merged into
the aes crate, along with some changes to how it initialized.
Signed-off-by: David Brown <david.brown@linaro.org>
diff --git a/sim/src/tlv.rs b/sim/src/tlv.rs
index a642446..6680b4f 100644
--- a/sim/src/tlv.rs
+++ b/sim/src/tlv.rs
@@ -17,6 +17,7 @@
use byteorder::{
LittleEndian, WriteBytesExt,
};
+use cipher::FromBlockCipher;
use crate::caps::Caps;
use crate::image::ImageVersion;
use log::info;
@@ -29,14 +30,16 @@
ECDSA_P256_SHA256_ASN1_SIGNING,
Ed25519KeyPair,
};
-use aes_ctr::{
+use aes::{
+ Aes128,
Aes128Ctr,
+ Aes256,
Aes256Ctr,
- stream_cipher::{
- generic_array::GenericArray,
- NewStreamCipher,
- SyncStreamCipher,
- },
+ NewBlockCipher
+};
+use cipher::{
+ generic_array::GenericArray,
+ StreamCipher,
};
use mcuboot_sys::c;
use typenum::{U16, U32};
@@ -622,11 +625,13 @@
let mut cipherkey = self.get_enc_key();
if aes256 {
let key: &GenericArray<u8, U32> = GenericArray::from_slice(&derived_key[..32]);
- let mut cipher = Aes256Ctr::new(&key, &nonce);
+ let block = Aes256::new(&key);
+ let mut cipher = Aes256Ctr::from_block_cipher(block, &nonce);
cipher.apply_keystream(&mut cipherkey);
} else {
let key: &GenericArray<u8, U16> = GenericArray::from_slice(&derived_key[..16]);
- let mut cipher = Aes128Ctr::new(&key, &nonce);
+ let block = Aes128::new(&key);
+ let mut cipher = Aes128Ctr::from_block_cipher(block, &nonce);
cipher.apply_keystream(&mut cipherkey);
}