diff --git a/Cargo.lock b/Cargo.lock index a9f6c64c..9ff09d98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -396,7 +396,7 @@ dependencies = [ "chrono", "clap", "criterion", - "ed25519-dalek 2.2.0", + "ed25519-dalek", "fail", "fancy-regex 0.18.0", "flate2", @@ -424,7 +424,7 @@ dependencies = [ "serde_json", "serial_test", "sha1", - "sha2 0.11.0", + "sha2", "tempfile", "thiserror", "tokio", @@ -548,7 +548,7 @@ checksum = "144e573728da132683b9488acd528274c790e07fc06ff81ee29f9d8f8b1041e0" dependencies = [ "blowfish", "pbkdf2", - "sha2 0.11.0", + "sha2", ] [[package]] @@ -609,16 +609,7 @@ version = "0.11.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "061f1a09225e328e1ffbb378d2d49923c0ca5fee19fb5ac1cc9c1e9d52b93690" dependencies = [ - "digest 0.11.3", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array 0.14.7", + "digest", ] [[package]] @@ -838,7 +829,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c" dependencies = [ - "block-buffer 0.12.1", + "block-buffer", "crypto-common 0.2.2", "inout 0.2.2", "zeroize", @@ -992,12 +983,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - [[package]] name = "const-oid" version = "0.10.2" @@ -1233,22 +1218,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "curve25519-dalek" -version = "4.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" -dependencies = [ - "cfg-if", - "cpufeatures 0.2.17", - "curve25519-dalek-derive", - "digest 0.10.7", - "fiat-crypto 0.2.9", - "rustc_version", - "subtle", - "zeroize", -] - [[package]] name = "curve25519-dalek" version = "5.0.0" @@ -1258,8 +1227,8 @@ dependencies = [ "cfg-if", "cpufeatures 0.3.0", "curve25519-dalek-derive", - "digest 0.11.3", - "fiat-crypto 0.3.0", + "digest", + "fiat-crypto", "rand_core 0.10.1", "rustc_version", "subtle", @@ -1325,23 +1294,13 @@ dependencies = [ "syn 2.0.119", ] -[[package]] -name = "der" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" -dependencies = [ - "const-oid 0.9.6", - "zeroize", -] - [[package]] name = "der" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71fd89660b2dc699704064e59e9dba0147b903e85319429e131620d022be411b" dependencies = [ - "const-oid 0.10.2", + "const-oid", "pem-rfc7468", "zeroize", ] @@ -1372,24 +1331,14 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common 0.1.7", -] - [[package]] name = "digest" version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ - "block-buffer 0.12.1", - "const-oid 0.10.2", + "block-buffer", + "const-oid", "crypto-common 0.2.2", "ctutils", ] @@ -1429,48 +1378,23 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0681a4fc24c767085329728d8dfba959af91228aa4610cca4f8ce317ba46ae0" dependencies = [ - "der 0.8.0", - "digest 0.11.3", + "der", + "digest", "elliptic-curve", "rfc6979", - "signature 3.0.0", - "spki 0.8.0", + "signature", + "spki", "zeroize", ] -[[package]] -name = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "pkcs8 0.10.2", - "signature 2.2.0", -] - [[package]] name = "ed25519" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29fcf32e6c73d1079f83ab4d782de2d81620346a5f38c6237a86a22f8368980a" dependencies = [ - "pkcs8 0.11.0", - "signature 3.0.0", -] - -[[package]] -name = "ed25519-dalek" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" -dependencies = [ - "curve25519-dalek 4.1.3", - "ed25519 2.2.3", - "rand_core 0.6.4", - "serde", - "sha2 0.10.9", - "subtle", - "zeroize", + "pkcs8", + "signature", ] [[package]] @@ -1479,12 +1403,12 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ebaa1a2bf1290ab3bfe5a7b771d050ebffab2711c19a81691c683a5144a25de" dependencies = [ - "curve25519-dalek 5.0.0", - "ed25519 3.0.0", + "curve25519-dalek", + "ed25519", "rand_core 0.10.1", "serde", - "sha2 0.11.0", - "signature 3.0.0", + "sha2", + "signature", "subtle", "zeroize", ] @@ -1504,13 +1428,13 @@ dependencies = [ "base16ct", "crypto-bigint", "crypto-common 0.2.2", - "digest 0.11.3", + "digest", "ff", "group", "hkdf", "hybrid-array", "pem-rfc7468", - "pkcs8 0.11.0", + "pkcs8", "rand_core 0.10.1", "sec1", "subtle", @@ -1641,12 +1565,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - [[package]] name = "fiat-crypto" version = "0.3.0" @@ -2029,7 +1947,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f" dependencies = [ - "digest 0.11.3", + "digest", ] [[package]] @@ -2820,7 +2738,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" dependencies = [ "cfg-if", - "digest 0.11.3", + "digest", ] [[package]] @@ -2889,9 +2807,9 @@ dependencies = [ [[package]] name = "mira-eval" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a983e47b39772faf20d898dad72f124eb4e8929679f561ec2193d77aef56d5" +checksum = "75db8c713ee4b8ed2fd8eb1797dd3129b0e545a039e9cef45ac19458447cc16c" dependencies = [ "async-trait", "inventory", @@ -2905,9 +2823,9 @@ dependencies = [ [[package]] name = "mira-macros" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a770347f4ce22c743dbf02c1a55af1dd88ee9bc35decc392e69e8df911fd38b" +checksum = "2bfd4d98e649e99b006acace5360e65ca6fd0bc6593e6502514592316ab38530" dependencies = [ "proc-macro2", "quote", @@ -2923,7 +2841,7 @@ dependencies = [ "hybrid-array", "kem", "module-lattice", - "pkcs8 0.11.0", + "pkcs8", "rand_core 0.10.1", "sha3 0.11.0", ] @@ -3398,7 +3316,7 @@ dependencies = [ "elliptic-curve", "primefield", "primeorder", - "sha2 0.11.0", + "sha2", ] [[package]] @@ -3409,10 +3327,10 @@ checksum = "d17b851e6b3e378ab4ecb07fa2ed23f4d15f075735f8fec9fa1e7bdce5f8301f" dependencies = [ "ecdsa", "elliptic-curve", - "fiat-crypto 0.3.0", + "fiat-crypto", "primefield", "primeorder", - "sha2 0.11.0", + "sha2", ] [[package]] @@ -3426,7 +3344,7 @@ dependencies = [ "elliptic-curve", "primefield", "primeorder", - "sha2 0.11.0", + "sha2", ] [[package]] @@ -3461,7 +3379,7 @@ dependencies = [ "futures", "log", "rand 0.10.2", - "sha2 0.11.0", + "sha2", "thiserror", "tokio", "windows", @@ -3523,7 +3441,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112d82ceb8c5bf524d9af484d4e4970c9fd5a0cc15ba14ad93dccd28873b0629" dependencies = [ - "digest 0.11.3", + "digest", "hmac", ] @@ -3645,8 +3563,8 @@ version = "0.8.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "986d2e952779af96ea048f160fd9194e1751b4faea78bcf3ceb456efe008088e" dependencies = [ - "der 0.8.0", - "spki 0.8.0", + "der", + "spki", ] [[package]] @@ -3658,22 +3576,12 @@ dependencies = [ "aes 0.9.1", "aes-gcm 0.11.0", "cbc", - "der 0.8.0", + "der", "pbkdf2", "rand_core 0.10.1", "scrypt", - "sha2 0.11.0", - "spki 0.8.0", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der 0.7.10", - "spki 0.7.3", + "sha2", + "spki", ] [[package]] @@ -3682,10 +3590,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451913da69c775a56034ea8d9003d27ee8948e12443eae7c038ba100a4f21cb7" dependencies = [ - "der 0.8.0", + "der", "pkcs5", "rand_core 0.10.1", - "spki 0.8.0", + "spki", ] [[package]] @@ -4310,16 +4218,16 @@ version = "0.10.0-rc.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30b2aa4ba0d89f73d1e332df05be0eeab8840351c36ca5654341dfdb57bb3caf" dependencies = [ - "const-oid 0.10.2", + "const-oid", "crypto-bigint", "crypto-primes", - "digest 0.11.3", + "digest", "pkcs1", - "pkcs8 0.11.0", + "pkcs8", "rand_core 0.10.1", - "sha2 0.11.0", - "signature 3.0.0", - "spki 0.8.0", + "sha2", + "signature", + "spki", "zeroize", ] @@ -4423,13 +4331,13 @@ dependencies = [ "cipher 0.5.2", "crypto-bigint", "ctr 0.10.1", - "curve25519-dalek 5.0.0", + "curve25519-dalek", "data-encoding", "delegate", - "der 0.8.0", - "digest 0.11.3", + "der", + "digest", "ecdsa", - "ed25519-dalek 3.0.0", + "ed25519-dalek", "elliptic-curve", "enum_dispatch", "flate2", @@ -4454,7 +4362,7 @@ dependencies = [ "pbkdf2", "pkcs1", "pkcs5", - "pkcs8 0.11.0", + "pkcs8", "polyval 0.7.1", "rand 0.10.2", "rand_core 0.10.1", @@ -4465,10 +4373,10 @@ dependencies = [ "scrypt", "sec1", "sha1", - "sha2 0.11.0", + "sha2", "sha3 0.12.0", - "signature 3.0.0", - "spki 0.8.0", + "signature", + "spki", "ssh-encoding", "ssh-key", "subtle", @@ -4709,7 +4617,7 @@ dependencies = [ "cfg-if", "pbkdf2", "salsa20", - "sha2 0.11.0", + "sha2", ] [[package]] @@ -4720,7 +4628,7 @@ checksum = "d56d437c2f19203ce5f7122e507831de96f3d2d4d3be5af44a0b0a09d8a80e4d" dependencies = [ "base16ct", "ctutils", - "der 0.8.0", + "der", "hybrid-array", "subtle", "zeroize", @@ -4851,9 +4759,9 @@ dependencies = [ [[package]] name = "serial_test" -version = "3.5.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "699f4197115b8a7e7ff19c9a315a4bd6fffec26cc4626ef45ecaea389e081c6d" +checksum = "a6df5ed973ad8d834e09f824f9e9f449af6b9a3745f78dec7cc752770bd3bf11" dependencies = [ "futures-executor", "futures-util", @@ -4865,13 +4773,13 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "3.5.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e153fc76e1c6a068703d6d29c508a0b15c061c4b7e43da59cc097bc342673c" +checksum = "a22144e767da4ddd8416dbf383700542ffd8a5dc493dfecedfe1fe3ad03c98ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.3", ] [[package]] @@ -4882,7 +4790,7 @@ checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "digest 0.11.3", + "digest", ] [[package]] @@ -4891,17 +4799,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" -[[package]] -name = "sha2" -version = "0.10.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" -dependencies = [ - "cfg-if", - "cpufeatures 0.2.17", - "digest 0.10.7", -] - [[package]] name = "sha2" version = "0.11.0" @@ -4910,7 +4807,7 @@ checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "digest 0.11.3", + "digest", ] [[package]] @@ -4919,7 +4816,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be176f1a57ce4e3d31c1a166222d9768de5954f811601fb7ca06fc8203905ce1" dependencies = [ - "digest 0.11.3", + "digest", "keccak", ] @@ -4929,7 +4826,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc9bad02c26382724b2d2692c6f179285e4b54eeecd7968f52a50059c3c11759" dependencies = [ - "digest 0.11.3", + "digest", "keccak", "sponge-cursor", ] @@ -4989,22 +4886,13 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "rand_core 0.6.4", -] - [[package]] name = "signature" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d567dcbaf0049cb8ac2608a76cd95ff9e4412e1899d389ee400918ca7537f5" dependencies = [ - "digest 0.11.3", + "digest", "rand_core 0.10.1", ] @@ -5108,16 +4996,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der 0.7.10", -] - [[package]] name = "spki" version = "0.8.0" @@ -5125,7 +5003,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d9efca8738c78ee9484207732f728b1ef517bbb1833d6fc0879ca898a522f6f" dependencies = [ "base64ct", - "der 0.8.0", + "der", ] [[package]] @@ -5162,7 +5040,7 @@ dependencies = [ "bytes", "crypto-bigint", "ctutils", - "digest 0.11.3", + "digest", "pem-rfc7468", "zeroize", ] @@ -5176,7 +5054,7 @@ dependencies = [ "argon2", "bcrypt-pbkdf", "ctutils", - "ed25519-dalek 3.0.0", + "ed25519-dalek", "hex", "hmac", "p256", @@ -5186,8 +5064,8 @@ dependencies = [ "rsa", "sec1", "sha1", - "sha2 0.11.0", - "signature 3.0.0", + "sha2", + "signature", "ssh-cipher", "ssh-encoding", "zeroize", diff --git a/Cargo.toml b/Cargo.toml index 7076714a..d097397c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,7 +65,7 @@ sha1 = "0.11" sha2 = "0.11" # Ed25519 signing (bot-auth request signing) -ed25519-dalek = { version = "2", features = ["rand_core"] } +ed25519-dalek = { version = "3", features = ["rand_core"] } rand = "0.10" zeroize = "1" @@ -114,7 +114,7 @@ russh = "0.62" turso_core = "0.8.0-pre.1" # Serial test execution -serial_test = "3" +serial_test = "4" # Python bindings # Important decision (PyPI storage): `abi3-py39` builds against CPython's stable diff --git a/crates/bashkit-eval/Cargo.toml b/crates/bashkit-eval/Cargo.toml index acbc007f..cf53f9c7 100644 --- a/crates/bashkit-eval/Cargo.toml +++ b/crates/bashkit-eval/Cargo.toml @@ -22,7 +22,7 @@ path = "src/main.rs" # Mira eval framework (crates.io). Imported as `mira`; the `macros` feature # provides the #[eval] discovery attribute. We use the in-process Subject path # (our own agent loop + provider stack) so we do NOT need mira-everruns. -mira-eval = { version = "0.4", features = ["macros"] } +mira-eval = { version = "0.5", features = ["macros"] } bashkit = { path = "../bashkit", features = ["scripted_tool", "jq"] } tokio = { workspace = true, features = ["rt-multi-thread", "io-std", "io-util", "fs"] } diff --git a/supply-chain/config.toml b/supply-chain/config.toml index fbae0fe8..c6f421bc 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -1104,11 +1104,11 @@ version = "1.2.1" criteria = "safe-to-deploy" [[exemptions.mira-eval]] -version = "0.4.0" +version = "0.5.0" criteria = "safe-to-deploy" [[exemptions.mira-macros]] -version = "0.4.0" +version = "0.5.0" criteria = "safe-to-deploy" [[exemptions.ml-kem]] @@ -1784,11 +1784,11 @@ version = "0.4.3" criteria = "safe-to-deploy" [[exemptions.serial_test]] -version = "3.5.0" +version = "4.0.1" criteria = "safe-to-run" [[exemptions.serial_test_derive]] -version = "3.5.0" +version = "4.0.1" criteria = "safe-to-run" [[exemptions.sha1]]