diff --git a/Cargo.lock b/Cargo.lock index 84cdfad3..95cc181b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -70,30 +70,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "atomic-polyfill" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30302dda7a66f8c55932ebf208f7def840743ff64d495e9ceffcd97c18f11d39" -dependencies = [ - "cortex-m", -] - -[[package]] -name = "bare-metal" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "bitfield" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719" - [[package]] name = "blobby" version = "0.3.0" @@ -166,18 +142,6 @@ dependencies = [ "dbl", ] -[[package]] -name = "cortex-m" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac919ef424449ec8c08d515590ce15d9262c0ca5f0da5b0c901e971a3b783b3" -dependencies = [ - "bare-metal", - "bitfield", - "embedded-hal", - "volatile-register", -] - [[package]] name = "cpufeatures" version = "0.1.5" @@ -239,16 +203,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "embedded-hal" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db184d3fa27bc7a2344250394c0264144dfe0bc81a4401801dcb964b8dd172ad" -dependencies = [ - "nb 0.1.3", - "void", -] - [[package]] name = "generic-array" version = "0.14.4" @@ -291,11 +245,10 @@ dependencies = [ [[package]] name = "heapless" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e26526e7168021f34243a3c8faac4dc4f938cde75a0f9b8e373cca5eb4e7ce" +checksum = "50530280e9a947b192e3a30a9d7bcead527b22da30ff7cbd334233d820aaf82a" dependencies = [ - "atomic-polyfill", "hash32", "stable_deref_trait", ] @@ -327,18 +280,18 @@ dependencies = [ [[package]] name = "kuznyechik" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1020a37e326b4033680520bf26d4ec7366f92827e5d2c5620a38511f2fd732c5" +checksum = "7a4e0a85306cf7cdcd497111b9ecd8df4da5290bacd3cc2f426ce3fb2c0a327e" dependencies = [ "cipher", ] [[package]] name = "libc" -version = "0.2.98" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" +checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" [[package]] name = "magma" @@ -362,21 +315,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "nb" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f" -dependencies = [ - "nb 1.0.0", -] - -[[package]] -name = "nb" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae" - [[package]] name = "opaque-debug" version = "0.3.0" @@ -431,15 +369,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - [[package]] name = "salsa20" version = "0.8.1" @@ -450,21 +379,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -493,33 +407,12 @@ dependencies = [ "subtle", ] -[[package]] -name = "vcell" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002" - [[package]] name = "version_check" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] -name = "volatile-register" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d67cb4616d99b940db1d6bd28844ff97108b498a6ca850e5b6191a532063286" -dependencies = [ - "vcell", -] - [[package]] name = "wasi" version = "0.10.2+wasi-snapshot-preview1" diff --git a/mgm/benches/mod.rs b/mgm/benches/mod.rs index b911c84d..1123d8fa 100644 --- a/mgm/benches/mod.rs +++ b/mgm/benches/mod.rs @@ -53,9 +53,9 @@ fn encrypt_msg_only_16kb(b: &mut Bencher) { fn decrypt_aad_only_16kb(b: &mut Bencher) { let c = Mgm::::new(GenericArray::from_slice(&KEY)); let nonce = GenericArray::from_slice(&NONCE); - let tag = GenericArray::default(); let aad = vec![0; 16 * 1024]; let mut buf = []; + let tag = c.encrypt_in_place_detached(nonce, &aad, &mut []).unwrap(); #[allow(unused_must_use)] b.iter(|| { @@ -71,13 +71,14 @@ fn decrypt_aad_only_16kb(b: &mut Bencher) { fn decrypt_msg_only_16kb(b: &mut Bencher) { let c = Mgm::::new(GenericArray::from_slice(&KEY)); let nonce = GenericArray::from_slice(&NONCE); - let tag = GenericArray::default(); let aad = []; - let mut buf = vec![0; 16 * 1024]; + let mut buf = vec![0u8; 16 * 1024]; + let tag = c.encrypt_in_place_detached(nonce, &aad, &mut buf).unwrap(); #[allow(unused_must_use)] b.iter(|| { - let (aad, buf, tag) = test::black_box((&aad, &mut buf, &tag)); + let mut buf_cpy = buf.clone(); + let (aad, buf, tag) = test::black_box((&aad, &mut buf_cpy, &tag)); let res = c.decrypt_in_place_detached(nonce, aad, buf, tag); test::black_box(res); });