Commit 9c6322f7 authored by David Brown's avatar David Brown Committed by David Brown
Browse files

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: default avatarDavid Brown <david.brown@linaro.org>
parent 9d4d45c5

sim/Cargo.lock

+123 −86
Original line number Diff line number Diff line 
# This file is automatically @generated by Cargo.

# It is not intended for manual editing.

[[package]]

name = "aes-ctr"

version = "0.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "92e60aeefd2a0243bd53a42e92444e039f67c3d7f0382c9813577696e7c10bf3"

dependencies = [

 "aes-soft",

 "aesni",

 "ctr",

 "stream-cipher",

]

version = 3



[[package]]

name = "aes-soft"

version = "0.4.0"

name = "aes"

version = "0.7.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "4925647ee64e5056cf231608957ce7c81e12d6d6e316b9ce1404778cc1d35fa7"

checksum = "495ee669413bfbe9e8cace80f4d3d78e6d8c8d99579f97fb93bde351b185f2d4"

dependencies = [

 "block-cipher",

 "byteorder",

 "opaque-debug",

]



[[package]]

name = "aesni"

version = "0.7.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d050d39b0b7688b3a3254394c3e30a9d66c41dcf9b05b0e2dbdc623f6505d264"

dependencies = [

 "block-cipher",

 "cfg-if 1.0.0",

 "cipher",

 "cpufeatures",

 "ctr",

 "opaque-debug",

 "stream-cipher",

]



[[package]]
@@ -67,34 +48,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"



[[package]]

name = "block-cipher"

version = "0.7.1"

name = "base64"

version = "0.13.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "fa136449e765dc7faa244561ccae839c394048667929af599b5d931ebe7b7f10"

dependencies = [

 "generic-array",

]

checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"



[[package]]

name = "bootsim"

version = "0.1.0"

dependencies = [

 "aes-ctr",

 "base64",

 "aes",

 "base64 0.13.0",

 "byteorder",

 "cipher",

 "docopt",

 "env_logger",

 "libc",

 "log",

 "mcuboot-sys",

 "pem",

 "rand",

 "rand 0.8.4",

 "ring",

 "serde",

 "serde_derive",

 "simflash",

 "typenum",

 "untrusted",

 "untrusted 0.9.0",

]



[[package]]
@@ -121,13 +100,37 @@ version = "0.1.10" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"



[[package]]

name = "cfg-if"

version = "1.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"



[[package]]

name = "cipher"

version = "0.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"

dependencies = [

 "generic-array",

]



[[package]]

name = "cpufeatures"

version = "0.1.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef"

dependencies = [

 "libc",

]



[[package]]

name = "ctr"

version = "0.4.0"

version = "0.7.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a3592740fd55aaf61dd72df96756bd0d11e6037b89dcf30ae2e1895b267692be"

checksum = "a232f92a03f37dd7d7dd2adc67166c77e9cd88de5b019b9a9eecfaeaf7bfd481"

dependencies = [

 "stream-cipher",

 "cipher",

]



[[package]]
@@ -144,9 +147,9 @@ dependencies = [ 


[[package]]

name = "env_logger"

version = "0.7.1"

version = "0.9.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"

checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"

dependencies = [

 "atty",

 "humantime",
@@ -171,9 +174,20 @@ version = "0.1.14" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"

dependencies = [

 "cfg-if",

 "cfg-if 0.1.10",

 "libc",

 "wasi 0.9.0+wasi-snapshot-preview1",

]



[[package]]

name = "getrandom"

version = "0.2.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"

dependencies = [

 "cfg-if 1.0.0",

 "libc",

 "wasi",

 "wasi 0.10.2+wasi-snapshot-preview1",

]



[[package]]
@@ -196,12 +210,9 @@ dependencies = [ 


[[package]]

name = "humantime"

version = "1.3.0"

version = "2.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"

dependencies = [

 "quick-error",

]

checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"



[[package]]

name = "js-sys"
@@ -220,9 +231,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" 


[[package]]

name = "libc"

version = "0.2.66"

version = "0.2.99"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"

checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"



[[package]]

name = "log"
@@ -230,7 +241,7 @@ version = "0.4.8" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"

dependencies = [

 "cfg-if",

 "cfg-if 0.1.10",

]



[[package]]
@@ -267,9 +278,9 @@ checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" 


[[package]]

name = "opaque-debug"

version = "0.2.3"

version = "0.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"

checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"



[[package]]

name = "pem"
@@ -277,7 +288,7 @@ version = "0.8.1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "59698ea79df9bf77104aefd39cc3ec990cb9693fb59c3b0a70ddf2646fdffb4b"

dependencies = [

 "base64",

 "base64 0.12.3",

 "once_cell",

 "regex",

]
@@ -297,12 +308,6 @@ dependencies = [ 
 "unicode-xid",

]



[[package]]

name = "quick-error"

version = "1.2.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"



[[package]]

name = "quote"

version = "1.0.2"
@@ -318,12 +323,23 @@ version = "0.7.3" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"

dependencies = [

 "getrandom",

 "getrandom 0.1.14",

 "libc",

 "rand_chacha",

 "rand_core",

 "rand_hc",

 "rand_pcg",

 "rand_chacha 0.2.2",

 "rand_core 0.5.1",

 "rand_hc 0.2.0",

]



[[package]]

name = "rand"

version = "0.8.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"

dependencies = [

 "libc",

 "rand_chacha 0.3.1",

 "rand_core 0.6.3",

 "rand_hc 0.3.1",

]



[[package]]
@@ -333,7 +349,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"

dependencies = [

 "ppv-lite86",

 "rand_core",

 "rand_core 0.5.1",

]



[[package]]

name = "rand_chacha"

version = "0.3.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"

dependencies = [

 "ppv-lite86",

 "rand_core 0.6.3",

]



[[package]]
@@ -342,7 +368,16 @@ version = "0.5.1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"

dependencies = [

 "getrandom",

 "getrandom 0.1.14",

]



[[package]]

name = "rand_core"

version = "0.6.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"

dependencies = [

 "getrandom 0.2.3",

]



[[package]]
@@ -351,16 +386,16 @@ version = "0.2.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"

dependencies = [

 "rand_core",

 "rand_core 0.5.1",

]



[[package]]

name = "rand_pcg"

version = "0.2.1"

name = "rand_hc"

version = "0.3.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"

checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"

dependencies = [

 "rand_core",

 "rand_core 0.6.3",

]



[[package]]
@@ -391,7 +426,7 @@ dependencies = [ 
 "lazy_static",

 "libc",

 "spin",

 "untrusted",

 "untrusted 0.7.0",

 "web-sys",

 "winapi",

]
@@ -421,7 +456,7 @@ name = "simflash" 
version = "0.1.0"

dependencies = [

 "log",

 "rand",

 "rand 0.7.3",

 "thiserror",

]
@@ -437,16 +472,6 @@ version = "0.5.2" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"



[[package]]

name = "stream-cipher"

version = "0.4.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "09f8ed9974042b8c3672ff3030a69fcc03b74c47c3d1ecb7755e8a3626011e88"

dependencies = [

 "block-cipher",

 "generic-array",

]



[[package]]

name = "strsim"

version = "0.9.3"
@@ -526,6 +551,12 @@ version = "0.7.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "60369ef7a31de49bcb3f6ca728d4ba7300d9a1658f94c727d4cab8c8d9f4aece"



[[package]]

name = "untrusted"

version = "0.9.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"



[[package]]

name = "version_check"

version = "0.1.5"
@@ -544,13 +575,19 @@ version = "0.9.0+wasi-snapshot-preview1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"



[[package]]

name = "wasi"

version = "0.10.2+wasi-snapshot-preview1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"



[[package]]

name = "wasm-bindgen"

version = "0.2.58"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5205e9afdf42282b192e2310a5b463a6d1c1d774e30dc3c791ac37ab42d2616c"

dependencies = [

 "cfg-if",

 "cfg-if 0.1.10",

 "wasm-bindgen-macro",

]

sim/Cargo.toml

+6 −5
Original line number Diff line number Diff line
@@ -34,19 +34,20 @@ downgrade-prevention = ["mcuboot-sys/downgrade-prevention"] 
[dependencies]

byteorder = "1.3"

libc = "0.2"

rand = { version = "0.7", features = ["small_rng"] }

rand = { version = "0.8", features = ["small_rng"] }

docopt = "1.1.0"

serde = "1.0"

serde_derive = "1.0"

log = "0.4"

env_logger = "0.7"

env_logger = "0.9"

simflash = { path = "simflash" }

mcuboot-sys = { path = "mcuboot-sys" }

ring = "0.16.11"

untrusted = "0.7"

untrusted = "0.9"

pem = "0.8"

aes-ctr = "0.4.0"

base64 = "0.12.0"

cipher = "0.3"

aes = { version = "0.7.4", features = ["ctr"] }

base64 = "0.13.0"

typenum = "1.13.0"



# The simulator runs very slowly without optimization.  A value of 1

sim/src/image.rs

+15 −10
Original line number Diff line number Diff line
@@ -24,14 +24,17 @@ use std::{ 
    mem,

    slice,

};

use aes_ctr::{

use aes::{

    Aes128,

    Aes128Ctr,

    Aes256,

    Aes256Ctr,

    stream_cipher::{

    NewBlockCipher,

};

use cipher::{

    FromBlockCipher,

    generic_array::GenericArray,

        NewStreamCipher,

        SyncStreamCipher,

    },

    StreamCipher,

    };



use simflash::{Flash, SimFlash, SimMultiFlash};
@@ -1264,7 +1267,7 @@ impl Images { 
        let mut resets = vec![0i32; count];

        let mut remaining_ops = total_ops;

        for reset in &mut resets {

            let reset_counter = rng.gen_range(1, remaining_ops / 2);

            let reset_counter = rng.gen_range(1 ..= remaining_ops / 2);

            let mut counter = reset_counter;

            match c::boot_go(&mut flash, &self.areadesc, Some(&mut counter), false) {

                x if x.interrupted() => (),
@@ -1481,11 +1484,13 @@ fn install_image(flash: &mut SimMultiFlash, slot: &SlotInfo, len: usize, 
        b_encimg = b_img.clone();

        if aes256 {

            let key: &GenericArray<u8, U32> = GenericArray::from_slice(enc_key.as_slice());

            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 b_encimg);

        } else {

            let key: &GenericArray<u8, U16> = GenericArray::from_slice(enc_key.as_slice());

            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 b_encimg);

        }

    }
@@ -1879,7 +1884,7 @@ fn mark_permanent_upgrade(flash: &mut SimMultiFlash, slot: &SlotInfo) { 


// Drop some pseudo-random gibberish onto the data.

fn splat(data: &mut [u8], seed: usize) {

    let mut seed_block = [0u8; 16];

    let mut seed_block = [0u8; 32];

    let mut buf = Cursor::new(&mut seed_block[..]);

    buf.write_u32::<LittleEndian>(0x135782ea).unwrap();

    buf.write_u32::<LittleEndian>(0x92184728).unwrap();

sim/src/tlv.rs

+13 −8
Original line number Diff line number Diff line
@@ -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 @@ use ring::signature::{ 
    ECDSA_P256_SHA256_ASN1_SIGNING,

    Ed25519KeyPair,

};

use aes_ctr::{

use aes::{

    Aes128,

    Aes128Ctr,

    Aes256,

    Aes256Ctr,

    stream_cipher::{

    NewBlockCipher

};

use cipher::{

    generic_array::GenericArray,

        NewStreamCipher,

        SyncStreamCipher,

    },

    StreamCipher,

};

use mcuboot_sys::c;

use typenum::{U16, U32};
@@ -622,11 +625,13 @@ impl ManifestGen for TlvGen { 
            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);

            }

CRA Git | Maintained and supported by SUSTech CRA and CCSE