diff --git a/Cargo.lock b/Cargo.lock index 5717b5d..f8804f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,21 +23,6 @@ dependencies = [ "mach", ] -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "aead" version = "0.5.2" @@ -88,9 +73,6 @@ name = "anyhow" version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" -dependencies = [ - "backtrace", -] [[package]] name = "autocfg" @@ -98,21 +80,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "backtrace" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - [[package]] name = "base16ct" version = "0.1.1" @@ -213,10 +180,7 @@ checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ "android-tzdata", "iana-time-zone", - "js-sys", "num-traits", - "time 0.1.45", - "wasm-bindgen", "winapi", ] @@ -283,16 +247,6 @@ dependencies = [ "digest", ] -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - [[package]] name = "const-oid" version = "0.9.4" @@ -365,50 +319,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.27", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.27", -] - [[package]] name = "dbl" version = "0.3.2" @@ -528,6 +438,7 @@ dependencies = [ "chrono", "clap", "const-oid 0.9.4", + "corncobs", "dice-mfg-msgs", "env_logger", "log", @@ -539,7 +450,7 @@ dependencies = [ "string-error", "tempfile", "x509-cert 0.2.4", - "yubihsm 0.42.0 (git+https://github.com/oxidecomputer/yubihsm.rs)", + "yubihsm", "zerocopy", "zeroize", ] @@ -750,15 +661,9 @@ checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - [[package]] name = "group" version = "0.12.1" @@ -846,9 +751,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -860,12 +765,11 @@ dependencies = [ [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -972,15 +876,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - [[package]] name = "linux-raw-sys" version = "0.1.4" @@ -1023,15 +918,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - [[package]] name = "nix" version = "0.24.3" @@ -1052,15 +938,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.17.1" @@ -1373,12 +1250,6 @@ dependencies = [ "libusb1-sys", ] -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - [[package]] name = "rustc_version" version = "0.4.0" @@ -1433,12 +1304,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - [[package]] name = "sec1" version = "0.3.0" @@ -1695,17 +1560,6 @@ dependencies = [ "syn 2.0.27", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "time" version = "0.3.21" @@ -1744,12 +1598,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - [[package]] name = "untrusted" version = "0.7.1" @@ -1777,12 +1625,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2071,35 +1913,7 @@ dependencies = [ "signature 2.0.0", "subtle", "thiserror", - "time 0.3.21", - "uuid", - "zeroize", -] - -[[package]] -name = "yubihsm" -version = "0.42.0" -source = "git+https://github.com/oxidecomputer/yubihsm.rs#b07cbdce04d85d66913d8d61120dc80b5a2b81d0" -dependencies = [ - "aes", - "bitflags 2.2.1", - "cbc", - "cmac", - "ecdsa 0.16.7", - "ed25519 2.1.0", - "hmac", - "log", - "p256 0.13.2", - "p384 0.13.0", - "pbkdf2", - "rand_core", - "serde", - "serde_json", - "sha2", - "signature 2.0.0", - "subtle", - "thiserror", - "time 0.3.21", + "time", "uuid", "zeroize", ] @@ -2118,7 +1932,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "yubihsm 0.42.0 (git+https://github.com/oxidecomputer/yubihsm.rs?branch=v0.42.0-with-audit)", + "yubihsm", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 98d0906..e148e20 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,8 @@ members = [ ] [workspace.dependencies] -anyhow = { version = "1", features = ["backtrace"] } +anyhow = { version = "1", default-features = false } +chrono = { version = "0.4.26", default-features=false } clap = { version = "4", default-features = false } corncobs = "0.1" derive_more = "0.99" @@ -19,12 +20,18 @@ hubpack = "0.1" log = { version = "0.4", features = ["std"] } pem = { version = "1", default-features = false } ron = "0.8" +rpassword = "7.2.0" salty = { version = "0.2", default-features = false } serde = { version = "1", default-features = false } serde-big-array = "0.4" serde_json = { version = "1", features = ["std", "alloc"] } +serialport = { git = "https://github.com/jgallagher/serialport-rs", branch = "illumos-support" } sha2 = "0.10" +sha3 = "0.10" +string-error = "0.1" tempfile = { version = "3", default-features = false } thiserror = "1.0.40" +x509-cert = { version = "0.2.4", default-features = false } yubihsm = { git = "https://github.com/oxidecomputer/yubihsm.rs", branch="v0.42.0-with-audit", features = ["default", "usb"] } zerocopy = "0.6" +zeroize = { version = "1.6.0", default-features = false } diff --git a/dice-mfg/Cargo.toml b/dice-mfg/Cargo.toml index 9d37278..a4184c9 100644 --- a/dice-mfg/Cargo.toml +++ b/dice-mfg/Cargo.toml @@ -6,21 +6,22 @@ description = "A command line tool for creating and programming device identitie license = "MPL-2.0" [dependencies] -anyhow = "1.0.71" -chrono = { version = "0.4.24", features = ["std"] } -clap = { version = "4", features = ["derive", "env"] } +anyhow.workspace = true +chrono = { workspace = true, features = ["clock", "std"] } +clap = { workspace = true, features = ["derive", "env"] } const-oid = { version = "0.9.2", features = ["std", "db"] } +corncobs.workspace = true dice-mfg-msgs = { path = "../dice-mfg-msgs", features = ["std"] } -env_logger = "0.10" -log = "0.4" -pem = "1" -rpassword = "7.2.0" -serde_json = { version = "1.0.96", features = ["std", "alloc"] } -serialport = { git = "https://github.com/jgallagher/serialport-rs", branch = "illumos-support" } -sha3 = { version = "0.10.8" } -string-error = "0.1" -tempfile = "3" -x509-cert = { version = "0.2.3", features = ["std"] } -yubihsm = { git = "https://github.com/oxidecomputer/yubihsm.rs" } -zerocopy = "0.6" -zeroize = { version = "1.6.0", features = ["std", "alloc"] } +env_logger.workspace = true +log.workspace = true +pem.workspace = true +rpassword.workspace = true +serde_json.workspace = true +serialport.workspace = true +sha3.workspace = true +string-error.workspace = true +tempfile.workspace = true +x509-cert = { workspace = true, features = ["pem", "std"] } +yubihsm.workspace = true +zerocopy.workspace = true +zeroize = { workspace = true, features = ["std", "alloc"] }