diff --git a/Cargo.lock b/Cargo.lock index 048957051..98542fe0d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -597,26 +597,30 @@ checksum = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690" [[package]] name = "devicemapper" -version = "0.32.3" +version = "0.33.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1da7c273a50833e1fbbff5b71b06fd1f3f00356b0fa1d392a21ee8b4aabb2a1e" +checksum = "caaf758a11609262ca9c93b7ff6fdbedc0c2f4e49d597474a7f70eab23eee699" dependencies = [ "bitflags", "devicemapper-sys", + "env_logger 0.9.3", "lazy_static", - "nix 0.24.3", + "log", + "nix", + "rand", + "retry", "semver 1.0.16", "serde", ] [[package]] name = "devicemapper-sys" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0178fe3c92cfbf6cd55ee2e2fd64df9f4136d6ba02d833f0be44b10b0dc8e918" +checksum = "f0b0f9d16560f830ae6e90b769017333c4561d2c84f39e7aa7d935d2e7bcbc4c" dependencies = [ "bindgen", - "nix 0.26.2", + "nix", ] [[package]] @@ -692,7 +696,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" dependencies = [ "atty", - "humantime", + "humantime 1.3.0", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +dependencies = [ + "atty", + "humantime 2.1.0", "log", "regex", "termcolor", @@ -747,7 +764,7 @@ dependencies = [ "fdo-util", "futures", "log", - "nix 0.26.2", + "nix", "openssl", "pretty_env_logger", "rand", @@ -770,7 +787,7 @@ dependencies = [ "fdo-util", "libcryptsetup-rs", "log", - "nix 0.26.2", + "nix", "passwd", "rand", "secrecy", @@ -1341,6 +1358,12 @@ dependencies = [ "quick-error", ] +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + [[package]] name = "hyper" version = "0.14.24" @@ -1648,15 +1671,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.7.1" @@ -1736,18 +1750,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "libc", - "memoffset 0.6.5", -] - [[package]] name = "nix" version = "0.26.2" @@ -1757,7 +1759,7 @@ dependencies = [ "bitflags", "cfg-if 1.0.0", "libc", - "memoffset 0.7.1", + "memoffset", "pin-utils", "static_assertions", ] @@ -2177,7 +2179,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" dependencies = [ - "env_logger", + "env_logger 0.7.1", "log", ] @@ -2322,6 +2324,15 @@ dependencies = [ "winreg", ] +[[package]] +name = "retry" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac95c60a949a63fd2822f4964939662d8f2c16c4fa0624fd954bc6e703b9a3f6" +dependencies = [ + "rand", +] + [[package]] name = "ron" version = "0.7.1" diff --git a/client-linuxapp/Cargo.toml b/client-linuxapp/Cargo.toml index 6fb42fcd6..0d315bb9d 100644 --- a/client-linuxapp/Cargo.toml +++ b/client-linuxapp/Cargo.toml @@ -19,7 +19,7 @@ uuid = "1.3" thiserror = "1" libcryptsetup-rs = { version = "0.6.1", features = ["mutex"] } secrecy = "0.8" -devicemapper = "0.32" +devicemapper = "0.33" fdo-data-formats = { path = "../data-formats", version = "0.4.8" } fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.8", features = ["client"] }