Revert "Move Cargo.toml to top level" (e1829771) · Commits · Wenxi XU / Mcuboot

Cargo.toml

deleted100644 → 0

+0 −13

Original line number	Diff line number	Diff line
		[workspace]
		members = ["sim"]
		exclude = ["ptest"]

		# The simulator runs very slowly without optimization. A value of 1
		# compiles in about half the time, but runs about 5-6 times slower. 2
		# and 3 are hardly different in either compile time or performance.
		# Use 2 in case that makes the code slightly more debuggable.
		[profile.test]
		opt-level = 2

		[profile.dev]
		opt-level = 0

Cargo.lock→sim/Cargo.lock

+163 −90

Original line number	Diff line number	Diff line
		# This file is automatically @generated by Cargo.
		# It is not intended for manual editing.
		version = 3

		[[package]]
		name = "aes-ctr"
		version = "0.4.0"
		@@ -38,13 +36,19 @@ dependencies = [

		[[package]]
		name = "aho-corasick"
		version = "0.7.18"
		version = "0.7.8"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
		checksum = "743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811"
		dependencies = [
		"memchr",
		]

		[[package]]
		name = "anyhow"
		version = "1.0.26"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c"

		[[package]]
		name = "atty"
		version = "0.2.14"
		@@ -62,12 +66,6 @@ version = "0.12.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"

		[[package]]
		name = "base64"
		version = "0.13.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"

		[[package]]
		name = "block-cipher"
		version = "0.7.1"
		@@ -82,7 +80,7 @@ name = "bootsim"
		version = "0.1.0"
		dependencies = [
		"aes-ctr",
		"base64 0.12.3",
		"base64",
		"byteorder",
		"docopt",
		"env_logger",
		@@ -101,27 +99,27 @@ dependencies = [

		[[package]]
		name = "bumpalo"
		version = "3.7.0"
		version = "3.2.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
		checksum = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742"

		[[package]]
		name = "byteorder"
		version = "1.4.3"
		version = "1.3.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
		checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"

		[[package]]
		name = "cc"
		version = "1.0.69"
		version = "1.0.50"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
		checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"

		[[package]]
		name = "cfg-if"
		version = "1.0.0"
		version = "0.1.10"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
		checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"

		[[package]]
		name = "ctr"
		@@ -134,9 +132,9 @@ dependencies = [

		[[package]]
		name = "docopt"
		version = "1.1.1"
		version = "1.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f"
		checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969"
		dependencies = [
		"lazy_static",
		"regex",
		@@ -159,30 +157,39 @@ dependencies = [

		[[package]]
		name = "generic-array"
		version = "0.14.4"
		version = "0.14.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
		checksum = "ac746a5f3bbfdadd6106868134545e684693d54d9d44f6e9588a7d54af0bf980"
		dependencies = [
		"typenum",
		"version_check",
		"version_check 0.9.2",
		]

		[[package]]
		name = "getrandom"
		version = "0.1.16"
		version = "0.1.14"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
		checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
		dependencies = [
		"cfg-if",
		"libc",
		"wasi",
		]

		[[package]]
		name = "heck"
		version = "0.3.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
		dependencies = [
		"unicode-segmentation",
		]

		[[package]]
		name = "hermit-abi"
		version = "0.1.19"
		version = "0.1.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
		checksum = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
		dependencies = [
		"libc",
		]
		@@ -198,9 +205,9 @@ dependencies = [

		[[package]]
		name = "js-sys"
		version = "0.3.51"
		version = "0.3.35"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062"
		checksum = "7889c7c36282151f6bf465be4700359318aef36baa951462382eae49e9577cf9"
		dependencies = [
		"wasm-bindgen",
		]
		@@ -213,15 +220,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

		[[package]]
		name = "libc"
		version = "0.2.98"
		version = "0.2.66"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
		checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"

		[[package]]
		name = "log"
		version = "0.4.14"
		version = "0.4.8"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
		checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
		dependencies = [
		"cfg-if",
		]
		@@ -238,15 +245,25 @@ dependencies = [

		[[package]]
		name = "memchr"
		version = "2.4.0"
		version = "2.3.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
		checksum = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"

		[[package]]
		name = "nom"
		version = "4.2.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
		dependencies = [
		"memchr",
		"version_check 0.1.5",
		]

		[[package]]
		name = "once_cell"
		version = "1.8.0"
		version = "1.4.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
		checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"

		[[package]]
		name = "opaque-debug"
		@@ -256,26 +273,26 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"

		[[package]]
		name = "pem"
		version = "0.8.3"
		version = "0.8.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb"
		checksum = "59698ea79df9bf77104aefd39cc3ec990cb9693fb59c3b0a70ddf2646fdffb4b"
		dependencies = [
		"base64 0.13.0",
		"base64",
		"once_cell",
		"regex",
		]

		[[package]]
		name = "ppv-lite86"
		version = "0.2.10"
		version = "0.2.8"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
		checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"

		[[package]]
		name = "proc-macro2"
		version = "1.0.28"
		version = "1.0.8"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
		checksum = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
		dependencies = [
		"unicode-xid",
		]
		@@ -288,9 +305,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"

		[[package]]
		name = "quote"
		version = "1.0.9"
		version = "1.0.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
		checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
		dependencies = [
		"proc-macro2",
		]
		@@ -348,30 +365,31 @@ dependencies = [

		[[package]]
		name = "regex"
		version = "1.5.4"
		version = "1.3.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
		checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8"
		dependencies = [
		"aho-corasick",
		"memchr",
		"regex-syntax",
		"thread_local",
		]

		[[package]]
		name = "regex-syntax"
		version = "0.6.25"
		version = "0.6.14"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
		checksum = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06"

		[[package]]
		name = "ring"
		version = "0.16.20"
		version = "0.16.11"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
		checksum = "741ba1704ae21999c00942f9f5944f801e977f54302af346b596287599ad1862"
		dependencies = [
		"cc",
		"lazy_static",
		"libc",
		"once_cell",
		"spin",
		"untrusted",
		"web-sys",
		@@ -380,18 +398,18 @@ dependencies = [

		[[package]]
		name = "serde"
		version = "1.0.126"
		version = "1.0.104"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
		checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
		dependencies = [
		"serde_derive",
		]

		[[package]]
		name = "serde_derive"
		version = "1.0.126"
		version = "1.0.104"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
		checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
		dependencies = [
		"proc-macro2",
		"quote",
		@@ -407,6 +425,12 @@ dependencies = [
		"thiserror",
		]

		[[package]]
		name = "sourcefile"
		version = "0.1.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"

		[[package]]
		name = "spin"
		version = "0.5.2"
		@@ -425,15 +449,15 @@ dependencies = [

		[[package]]
		name = "strsim"
		version = "0.10.0"
		version = "0.9.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
		checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"

		[[package]]
		name = "syn"
		version = "1.0.74"
		version = "1.0.14"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
		checksum = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
		dependencies = [
		"proc-macro2",
		"quote",
		@@ -442,56 +466,77 @@ dependencies = [

		[[package]]
		name = "termcolor"
		version = "1.1.2"
		version = "1.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
		checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
		dependencies = [
		"winapi-util",
		]

		[[package]]
		name = "thiserror"
		version = "1.0.26"
		version = "1.0.21"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
		checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42"
		dependencies = [
		"thiserror-impl",
		]

		[[package]]
		name = "thiserror-impl"
		version = "1.0.26"
		version = "1.0.21"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
		checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab"
		dependencies = [
		"proc-macro2",
		"quote",
		"syn",
		]

		[[package]]
		name = "thread_local"
		version = "1.0.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
		dependencies = [
		"lazy_static",
		]

		[[package]]
		name = "typenum"
		version = "1.13.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"

		[[package]]
		name = "unicode-segmentation"
		version = "1.6.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"

		[[package]]
		name = "unicode-xid"
		version = "0.2.2"
		version = "0.2.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
		checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"

		[[package]]
		name = "untrusted"
		version = "0.7.1"
		version = "0.7.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
		checksum = "60369ef7a31de49bcb3f6ca728d4ba7300d9a1658f94c727d4cab8c8d9f4aece"

		[[package]]
		name = "version_check"
		version = "0.9.3"
		version = "0.1.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"

		[[package]]
		name = "version_check"
		version = "0.9.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
		checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"

		[[package]]
		name = "wasi"
		@@ -501,9 +546,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"

		[[package]]
		name = "wasm-bindgen"
		version = "0.2.74"
		version = "0.2.58"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd"
		checksum = "5205e9afdf42282b192e2310a5b463a6d1c1d774e30dc3c791ac37ab42d2616c"
		dependencies = [
		"cfg-if",
		"wasm-bindgen-macro",
		@@ -511,9 +556,9 @@ dependencies = [

		[[package]]
		name = "wasm-bindgen-backend"
		version = "0.2.74"
		version = "0.2.58"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900"
		checksum = "11cdb95816290b525b32587d76419facd99662a07e59d3cdb560488a819d9a45"
		dependencies = [
		"bumpalo",
		"lazy_static",
		@@ -526,9 +571,9 @@ dependencies = [

		[[package]]
		name = "wasm-bindgen-macro"
		version = "0.2.74"
		version = "0.2.58"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4"
		checksum = "574094772ce6921576fb6f2e3f7497b8a76273b6db092be18fc48a082de09dc3"
		dependencies = [
		"quote",
		"wasm-bindgen-macro-support",
		@@ -536,9 +581,9 @@ dependencies = [

		[[package]]
		name = "wasm-bindgen-macro-support"
		version = "0.2.74"
		version = "0.2.58"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97"
		checksum = "e85031354f25eaebe78bb7db1c3d86140312a911a106b2e29f9cc440ce3e7668"
		dependencies = [
		"proc-macro2",
		"quote",
		@@ -549,25 +594,53 @@ dependencies = [

		[[package]]
		name = "wasm-bindgen-shared"
		version = "0.2.74"
		version = "0.2.58"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f"
		checksum = "f5e7e61fc929f4c0dddb748b102ebf9f632e2b8d739f2016542b4de2965a9601"

		[[package]]
		name = "wasm-bindgen-webidl"
		version = "0.2.58"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ef012a0d93fc0432df126a8eaf547b2dce25a8ce9212e1d3cbeef5c11157975d"
		dependencies = [
		"anyhow",
		"heck",
		"log",
		"proc-macro2",
		"quote",
		"syn",
		"wasm-bindgen-backend",
		"weedle",
		]

		[[package]]
		name = "web-sys"
		version = "0.3.51"
		version = "0.3.35"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582"
		checksum = "aaf97caf6aa8c2b1dac90faf0db529d9d63c93846cca4911856f78a83cebf53b"
		dependencies = [
		"anyhow",
		"js-sys",
		"sourcefile",
		"wasm-bindgen",
		"wasm-bindgen-webidl",
		]

		[[package]]
		name = "weedle"
		version = "0.10.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164"
		dependencies = [
		"nom",
		]

		[[package]]
		name = "winapi"
		version = "0.3.9"
		version = "0.3.8"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
		checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
		dependencies = [
		"winapi-i686-pc-windows-gnu",
		"winapi-x86_64-pc-windows-gnu",
		@@ -581,9 +654,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

		[[package]]
		name = "winapi-util"
		version = "0.1.5"
		version = "0.1.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
		checksum = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
		dependencies = [
		"winapi",
		]

sim/Cargo.toml

+10 −0

Original line number	Diff line number	Diff line
		@@ -48,3 +48,13 @@ pem = "0.8"
		aes-ctr = "0.4.0"
		base64 = "0.12.0"
		typenum = "1.13.0"

		# The simulator runs very slowly without optimization. A value of 1
		# compiles in about half the time, but runs about 5-6 times slower. 2
		# and 3 are hardly different in either compile time or performance.
		# Use 2 in case that makes the code slightly more debuggable.
		[profile.test]
		opt-level = 2

		[profile.dev]
		opt-level = 2

Admin message