diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index 275c7143d..f09d75320 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -575,30 +575,14 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.22.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85525306c4291d1b73ce93c8acf9c339f9b213aef6c1d85c3830cbf1c16325c" +checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" dependencies = [ "bitflags", "crossterm_winapi", "libc", - "mio 0.7.13", - "parking_lot 0.11.2", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fd7173631a4e9e2ca8b32ae2fad58aab9843ea5aaf56642661937d87e28a3e" -dependencies = [ - "bitflags", - "crossterm_winapi", - "libc", - "mio 0.7.13", + "mio", "parking_lot 0.12.1", "signal-hook", "signal-hook-mio", @@ -1674,19 +1658,6 @@ dependencies = [ "adler", ] -[[package]] -name = "mio" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", -] - [[package]] name = "mio" version = "0.8.5" @@ -1699,15 +1670,6 @@ dependencies = [ "windows-sys 0.42.0", ] -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - [[package]] name = "msvc-demangler" version = "0.9.0" @@ -1812,20 +1774,11 @@ dependencies = [ "inotify", "kqueue", "libc", - "mio 0.8.5", + "mio", "walkdir", "winapi", ] -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi", -] - [[package]] name = "num-integer" version = "0.1.44" @@ -1987,7 +1940,7 @@ dependencies = [ "clap", "cobertura", "coverage", - "crossterm 0.22.1", + "crossterm", "env_logger", "flume", "futures", @@ -2872,12 +2825,12 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29fd5867f1c4f2c5be079aee7a2adf1152ebb04a4bc4d341f504b7dece607ed4" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", - "mio 0.7.13", + "mio", "signal-hook", ] @@ -3291,7 +3244,7 @@ dependencies = [ "bytes", "libc", "memchr", - "mio 0.8.5", + "mio", "num_cpus", "parking_lot 0.12.1", "pin-project-lite", @@ -3411,13 +3364,13 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "tui" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fe69244ec2af261bced1d9046a6fee6c8c2a6b0228e59e5ba39bc8ba4ed729" +checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" dependencies = [ "bitflags", "cassowary", - "crossterm 0.23.1", + "crossterm", "unicode-segmentation", "unicode-width", ] diff --git a/src/agent/onefuzz-task/Cargo.toml b/src/agent/onefuzz-task/Cargo.toml index b917ea0f6..74682e275 100644 --- a/src/agent/onefuzz-task/Cargo.toml +++ b/src/agent/onefuzz-task/Cargo.toml @@ -18,7 +18,7 @@ backoff = { version = "0.4", features = ["tokio"] } clap = { version = "4", features = ["cargo", "string"] } cobertura = { path = "../cobertura" } coverage = { path = "../coverage" } -crossterm = "0.22" +crossterm = "0.25" env_logger = "0.10" flume = "0.10" futures = "0.3" @@ -49,7 +49,7 @@ thiserror = "1.0" tokio = { version = "1.24", features = ["full"] } tokio-util = { version = "0.7", features = ["full"] } tokio-stream = "0.1" -tui = { version = "0.18", default-features = false, features = ['crossterm'] } +tui = { version = "0.19", default-features = false, features = ['crossterm'] } url = { version = "2.3", features = ["serde"] } uuid = { version = "0.8", features = ["serde", "v4"] } chrono = { version = "0.4", default-features = false, features = [ diff --git a/src/ci/check-dependencies.sh b/src/ci/check-dependencies.sh index fe35f0b46..02b9b07c0 100755 --- a/src/ci/check-dependencies.sh +++ b/src/ci/check-dependencies.sh @@ -51,6 +51,7 @@ libunwind.so.8 linux-vdso.so.1" \ \ "ADVAPI32.dll +GDI32.dll KERNEL32.DLL KERNELBASE.dll MSASN1.dll @@ -61,11 +62,15 @@ apphelp.dll bcrypt.dll crypt32.dll dbghelp.dll +gdi32full.dll +msvcp_win.dll msvcrt.dll ntdll.dll sechost.dll secur32.dll ucrtbase.dll +user32.dll +win32u.dll ws2_32.dll" check "$script_dir/../agent/target/release/onefuzz-agent" \