From 0a5520b63e13512050540886aff8127c09aa6e85 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 9 Nov 2026 09:44:10 +0100 Subject: [PATCH 1/6] chore: Dependency bumps, inlcuding `rsa` 0.10 --- Cargo.lock | 242 ++++++++++++------------- Cargo.toml | 20 +- crates/stackable-certs/CHANGELOG.md | 6 + crates/stackable-certs/src/keys/mod.rs | 7 - crates/stackable-certs/src/keys/rsa.rs | 6 +- 5 files changed, 130 insertions(+), 151 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9571b3637..c363a6533 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -129,11 +129,20 @@ version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" +[[package]] +name = "ar_archive_writer" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73cd58deff2140a0a8eae87e417bd01db68a33e148aa93d1e8cd837e55e312b6" +dependencies = [ + "object", +] + [[package]] name = "arc-swap" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380962b3d93b99642e50b9febf72c071e97e8b32d86eae9cf4ef582bb960ae6e" +checksum = "db4c94f57a570fce5d381be3289b3f79aef6332d72948fe82ab5772e423ccf92" dependencies = [ "rustversion", ] @@ -186,7 +195,7 @@ checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -309,12 +318,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "bitflags" version = "2.13.2" @@ -328,6 +331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa" dependencies = [ "hybrid-array", + "zeroize", ] [[package]] @@ -371,9 +375,9 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "cc" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375989decec1a0fa424442bed520fa12ede43a48475ce8c7417d2c69b32b5f6b" +checksum = "4ff2a8126fff0f8c839080d619675a585e61720bb12d2baceae45769fd66f155" dependencies = [ "find-msvc-tools", "jobserver", @@ -457,7 +461,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -652,9 +656,9 @@ checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6" [[package]] name = "crypto-bigint" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c035cb64cba03dad2fb921f3e218785e8cf9a41790da5eb3a1400f62fa2be11" +checksum = "914c195c4d7fbc5ed7f88d14cbf85914d5c664967658d43404b263913a477e82" dependencies = [ "cpubits", "ctutils", @@ -690,9 +694,9 @@ dependencies = [ [[package]] name = "ctutils" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2376ffd6f96d8a9db59875b4b6b0237d6900b5baf64279714e05493ce64828a" +checksum = "261af4dc7a06ea8a527a8717d8cbba3417530d6ea14e1edb3de6b67806be474f" dependencies = [ "cmov", "subtle", @@ -742,7 +746,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -764,7 +768,7 @@ checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785" dependencies = [ "darling_core 0.24.1", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -773,37 +777,6 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4583a4551df46e2792f82ceeac45e850d2e2d5debba0b91f102385cda5b11f06" -[[package]] -name = "defmt" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a0795ac740cb54d7b3775c9c17345f6aaecf884c01733b39d6017738e0e3e1" -dependencies = [ - "bitflags 1.3.2", - "defmt-macros", -] - -[[package]] -name = "defmt-macros" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "840bb056bd99c495c9188198a258ab787c79f306d864db3e6e8451442d6d8366" -dependencies = [ - "defmt-parser", - "proc-macro2", - "quote", - "syn 3.0.9", -] - -[[package]] -name = "defmt-parser" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71958f69fb2de856c5dd51ac9377e986ca1aa5919f931bf5395a807277f889a0" -dependencies = [ - "thiserror 2.0.21", -] - [[package]] name = "delegate" version = "0.13.5" @@ -907,6 +880,7 @@ dependencies = [ "const-oid", "crypto-common", "ctutils", + "zeroize", ] [[package]] @@ -915,7 +889,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" dependencies = [ - "bitflags 2.13.2", + "bitflags", "objc2", ] @@ -927,7 +901,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -973,14 +947,14 @@ dependencies = [ [[package]] name = "educe" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebdb1f8f8d2815bbe7b369a7da10343c82026a4503b68bd1279ba557611e96d" +checksum = "a00371d2607edea062396ef1ce6ade65c8e915ac7a1277daa198208420f682c6" dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -1065,7 +1039,7 @@ checksum = "a65863d15a4ce2888bd2f0f543cc963d3879c3a022c8ee43f6141d479a3ac815" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -1134,9 +1108,9 @@ checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe" [[package]] name = "flate2" -version = "1.1.10" +version = "1.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb" +checksum = "626d4928326b646e70f65ed36fc7cf9f206bdb68a0019ee7c6b4709da4e084c4" dependencies = [ "crc32fast", "miniz_oxide", @@ -1220,7 +1194,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -1310,7 +1284,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddddbf932745a6be37109b6112d3ee09696106f848449069d3a57bba937ab82e" dependencies = [ - "bitflags 2.13.2", + "bitflags", "libc", "libgit2-sys", "log", @@ -1349,9 +1323,9 @@ dependencies = [ [[package]] name = "granit-parser" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da55feca5d1625466bae068f9fd4b87892caeae70c3fe671ddb0f50d41aebf37" +checksum = "05f05586d4d4df3d47123207826c40b252728b438a1a07bad3c01ee6bea401df" dependencies = [ "arraydeque", "smallvec", @@ -1853,9 +1827,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4" [[package]] name = "java-properties" @@ -1870,11 +1844,10 @@ dependencies = [ [[package]] name = "jiff" -version = "0.2.38" +version = "0.2.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b005715dcbeb0089a3c0dab99f2ff1cc3b2525323552703d648585d342a383" +checksum = "fcefdcefac59ac8f8401852e3427d55610481fc41e6625c39bac62d2d771623a" dependencies = [ - "defmt", "jiff-core", "jiff-static", "jiff-tzdb-platform", @@ -1887,19 +1860,18 @@ dependencies = [ [[package]] name = "jiff-core" -version = "0.1.1" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e52fe76043ccecc9005d2305ebaadf7d7fc0cc89ca6baa10a94d6bc68c7128c" +checksum = "77a24020db0ee88d1c681d677681bd31f9f4ea189a455425223d52ce4f1508aa" dependencies = [ - "defmt", "log", ] [[package]] name = "jiff-static" -version = "0.2.38" +version = "0.2.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc9817253cf7c7ee4684451bd327e88d6f3658014e54a29198625590650695c" +checksum = "203edf9b0ce4083ec8fbf4adc823eac89768ea994b4953fc0dab1b90083234dd" dependencies = [ "jiff-core", "proc-macro2", @@ -2053,7 +2025,7 @@ dependencies = [ "rstest_reuse", "serde", "snafu 0.9.2", - "syn 3.0.9", + "syn 3.0.10", "yaml_serde", ] @@ -2172,7 +2144,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -2234,9 +2206,9 @@ checksum = "2e126dda6f34391ab7b444f9922055facc83c07a910da3eb16f1e4d9c45dc777" [[package]] name = "libz-sys" -version = "1.1.31" +version = "1.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff20308ecabd635a2dc1dd5834a86c462cca20efba1d5d3ddab1f8aea3455cb2" +checksum = "69965d2409bff8c8cea3829009fff66a86f05a0570656552ef70f616e8e4bd85" dependencies = [ "cc", "libc", @@ -2305,9 +2277,9 @@ checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "mime" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +checksum = "d5848f5a9e8117cf94f2f90faac24a87ff81600ff8628c1e3deaab572e76bfa1" [[package]] name = "minimal-lexical" @@ -2380,7 +2352,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b152f4f18819e638ea350a740b16de75099302b5ec3a58f4f8766ef2fcf695d" dependencies = [ - "bitflags 2.13.2", + "bitflags", "byteorder", "derive_builder", "getset", @@ -2468,7 +2440,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ - "bitflags 2.13.2", + "bitflags", "dispatch2", "objc2", ] @@ -2485,7 +2457,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ - "bitflags 2.13.2", + "bitflags", "objc2", ] @@ -2510,6 +2482,15 @@ dependencies = [ "objc2-foundation", ] +[[package]] +name = "object" +version = "0.39.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e5a6c098c7a3b6547378093f5cc30bc54fd361ce711e05293a5cc589562739b" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.21.4" @@ -2747,7 +2728,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -2761,9 +2742,9 @@ dependencies = [ [[package]] name = "pest_stack_guard" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97e6cd2217057fa86b6eaa512917e58089d875b957a31e35e7ab729977e0a5f2" +checksum = "9ac6154fd4418b8f0b82532c59c26f303f9ca59a64c883e8ce3971fd82733439" dependencies = [ "psm", "stacker", @@ -2797,9 +2778,9 @@ checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pkcs1" -version = "0.8.0-rc.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f485dbafe293ea6ccaa7d82bc591651a796eb8a9aec3df040b057b706073dbc3" +checksum = "6250dd7321adbe93d12b750aee0ced159fd13e77f625edcdf1cb6f83cd99f650" dependencies = [ "der", "spki", @@ -2878,7 +2859,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bfe0f4c752e450fc2faf62654f1c134747922825d5b04ca717b8874f41a40c0" dependencies = [ "proc-macro2", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -2960,10 +2941,11 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.24" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" +checksum = "4dcd034599e63b970727f70d79e02d62390a4a84f7c6b827c27c46d5ac3fa622" dependencies = [ + "ar_archive_writer", "cc", ] @@ -3070,7 +3052,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.13.2", + "bitflags", ] [[package]] @@ -3090,7 +3072,7 @@ checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -3191,14 +3173,16 @@ dependencies = [ [[package]] name = "rsa" -version = "0.10.0-rc.19" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33405e321e16ef941ca66e254f6904c3aafd3c7ff001fb88bf11c73eb75c2b85" +checksum = "23e77fd77e0dea28b3011fd62d15445b7de7959333b0276d930e03be0f755699" dependencies = [ "const-oid", "crypto-bigint", + "crypto-common", "crypto-primes", "digest", + "hmac", "pkcs1", "pkcs8", "rand_core 0.10.1", @@ -3263,7 +3247,7 @@ version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa" dependencies = [ - "bitflags 2.13.2", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -3397,7 +3381,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -3435,7 +3419,7 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ - "bitflags 2.13.2", + "bitflags", "core-foundation 0.10.1", "core-foundation-sys", "libc", @@ -3474,9 +3458,9 @@ dependencies = [ [[package]] name = "serde-saphyr" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253edfdea34032da21af84e16fcc94f4c7a6ba237f9f3bc2dbf43cea8535c44" +checksum = "d43fb82d550b07e6f929a58d7d0935182602f48ddead875f5ee313c41c8f07fe" dependencies = [ "annotate-snippets", "base64 0.23.1", @@ -3516,7 +3500,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -3527,7 +3511,7 @@ checksum = "f852137cce035d6a4df67ccce505ff6b3e9fd3a10e3e52b24dc71e650bb1a9bd" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -3556,9 +3540,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c" +checksum = "9c187e0a369471c550af028cba56d4f4fa2a489ad28151ae95a4d340a2a8b782" dependencies = [ "serde_core", ] @@ -3698,9 +3682,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.16.4" +version = "1.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8" +checksum = "149309498a5f7334b12ddae0cad8aba81ce785fe91755068867e017cf98fee46" [[package]] name = "snafu" @@ -3863,7 +3847,7 @@ dependencies = [ "proc-macro2", "quote", "stackable-operator", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -3944,7 +3928,7 @@ dependencies = [ "serde_json", "snafu 0.9.2", "stackable-versioned", - "syn 3.0.9", + "syn 3.0.10", "tracing", "trybuild", "yaml_serde", @@ -4059,9 +4043,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.9" +version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b" +checksum = "4ae9ccbea3a7b0b09443036490c8f34a8b1b760fd345e5c0dae0aac718faea79" dependencies = [ "proc-macro2", "quote", @@ -4085,7 +4069,7 @@ checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -4110,7 +4094,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" dependencies = [ - "bitflags 2.13.2", + "bitflags", "core-foundation 0.9.4", "system-configuration-sys", ] @@ -4196,7 +4180,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -4299,7 +4283,7 @@ checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -4352,9 +4336,9 @@ dependencies = [ [[package]] name = "toml" -version = "1.1.8+spec-1.1.0" +version = "1.2.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d" +checksum = "d5755c51863cdac711f1956baf8eb9588e060755f7d3c4c979e70ea1e1f32cd7" dependencies = [ "indexmap", "serde_core", @@ -4367,18 +4351,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "1.1.2+spec-1.1.0" +version = "1.1.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053" +checksum = "173f25c883cd2176a2d8212155638c0a60d484a9d84546d270866f40f56b6e49" dependencies = [ "serde_core", ] [[package]] name = "toml_edit" -version = "0.25.17+spec-1.1.0" +version = "0.25.19+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3641d5bbb5349a79e1020a242d251efbc546ad8048d133958323ce9c40a9c9c" +checksum = "dd43688c4858d7264ae1cf9a9f874a67c3feb74a883b1cd7bebd6a4ea8307218" dependencies = [ "indexmap", "toml_datetime", @@ -4397,9 +4381,9 @@ dependencies = [ [[package]] name = "toml_writer" -version = "1.1.3+spec-1.1.0" +version = "1.2.0+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770" +checksum = "009dbb7700f11c55ef83aebbe4c0e9cf1f1ac0844bd8d6f00dc38f302026e13a" [[package]] name = "tonic" @@ -4477,7 +4461,7 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ - "bitflags 2.13.2", + "bitflags", "bytes", "futures-util", "http", @@ -4496,7 +4480,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08a05a66a4fdd61cbbe0a1d755ffe0ca6aba159dd4820936a0ff8a8278245b9c" dependencies = [ "base64 0.22.1", - "bitflags 2.13.2", + "bitflags", "bytes", "http", "http-body", @@ -4746,9 +4730,9 @@ checksum = "3a3b425286980a367278453f3b6d28cdcb134b574e5a35824a6ff5eebad50bb6" [[package]] name = "uuid" -version = "1.29.0" +version = "1.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0e2d11620c50695fe12bbbfde96b3477fe606e7284c22d505c12ce51214514" +checksum = "bed99139f7dac9b5cfe5f17be4d66dc7079a34dee1d74bcc77217119240e267c" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -4849,7 +4833,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", "wasm-bindgen-shared", ] @@ -5133,9 +5117,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" +checksum = "8c3b93199df0ab874cdf0c6a94f0a0dc3423fe41f1cafb62b8bd7b1deb277aef" dependencies = [ "memchr", ] @@ -5229,7 +5213,7 @@ checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", "synstructure", ] @@ -5270,7 +5254,7 @@ checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", "synstructure", ] @@ -5324,7 +5308,7 @@ checksum = "c3743ddbf47738d929cd1ae2e199d40d0162979dfe31aef8ae646d2bf00bf97a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index cdd0d3cb6..793de618e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ edition = "2024" repository = "https://github.com/stackabletech/operator-rs" [workspace.dependencies] -arc-swap = "1.9.3" +arc-swap = "1.9.4" async-trait = "0.1.92" axum = { version = "0.8.9", features = ["http2"] } base16ct = "1.0" @@ -30,7 +30,7 @@ delegate = "0.13.5" dockerfile-parser = "0.9.0" # Part of the RustCrypto ecosystem, see the const-oid comment above. ecdsa = { version = "0.17.0", features = ["digest", "pem"] } -educe = { version = "0.8.1", default-features = false, features = ["Clone", "Debug", "Default", "PartialEq", "Eq"] } +educe = { version = "0.8.2", default-features = false, features = ["Clone", "Debug", "Default", "PartialEq", "Eq"] } either = "1.19.0" futures = "0.3.34" futures-util = "0.3.34" @@ -39,7 +39,7 @@ http = "1.5.0" humantime = "2.4.0" indexmap = "2.14.2" indoc = "2.0.8" -jiff = "0.2.38" +jiff = "0.2.41" insta = { version = "1.49.0", features = ["glob"] } hyper = { version = "1.12.0", features = ["full"] } hyper-util = "0.1.21" @@ -72,12 +72,8 @@ rand = "0.10.3" # Secrets in stackable-operator. rand_core = "0.10.1" regex = "1.13.1" -# Part of the RustCrypto ecosystem, see the const-oid comment above. Pinned exactly, as release -# candidates can contain breaking changes. Switch back to a regular version requirement once rsa -# 0.10.0 is released: https://github.com/RustCrypto/RSA -# We are ok with using a RC version, as it enables us to move the entire ecosystem forward and e.g. -# fixes RUSTSEC-2026-0387 -rsa = { version = "=0.10.0-rc.19", features = ["sha2"] } +# Part of the RustCrypto ecosystem, see the const-oid comment above +rsa = { version = "0.10.0", features = ["pkcs1v15"] } rstest = "0.28.0" rstest_reuse = "0.7.1" schemars = { version = "1.2.3", features = ["url2"] } @@ -93,7 +89,7 @@ similar-asserts = "2.0.0" snafu = "0.9.2" stackable-operator-derive = { path = "stackable-operator-derive" } strum = { version = "0.28.0", features = ["derive"] } -syn = "3.0.9" +syn = "3.0.10" sysinfo = "0.40.1" tempfile = "3.27.0" time = { version = "0.3.55" } @@ -109,8 +105,8 @@ tracing-opentelemetry = "0.34.0" tracing-subscriber = { version = "0.3.23", features = ["env-filter", "json"] } trybuild = "1.0.122" url = { version = "2.5.8", features = ["serde"] } -uuid = "1.29.0" -winnow = "1.0.4" +uuid = "1.29.2" +winnow = "1.0.5" # Part of the RustCrypto ecosystem, see the const-oid comment above. x509-cert = { version = "0.3.0", features = ["builder"] } xml = "1.4.0" diff --git a/crates/stackable-certs/CHANGELOG.md b/crates/stackable-certs/CHANGELOG.md index 55cb55b96..f96690106 100644 --- a/crates/stackable-certs/CHANGELOG.md +++ b/crates/stackable-certs/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Changed + +- Bump `rsa` to 0.10.0, which fixes the Marvin attack (RUSTSEC-2023-0071) ([#XXXX]). + +[#XXXX]: https://github.com/stackabletech/operator-rs/pull/XXXX + ## [0.5.0] - 2026-11-03 ### Changed diff --git a/crates/stackable-certs/src/keys/mod.rs b/crates/stackable-certs/src/keys/mod.rs index 862d33a49..0995a06ba 100644 --- a/crates/stackable-certs/src/keys/mod.rs +++ b/crates/stackable-certs/src/keys/mod.rs @@ -22,13 +22,6 @@ //! use stackable_certs::keys::rsa::SigningKey; //! let key = SigningKey::new().unwrap(); //! ``` -//! -//! It should be noted, that the crate is currently vulnerable to the recently -//! discovered Marvin attack. The `openssl` crate is also impacted by this. See: -//! -//! - -//! - -//! - use std::fmt::Debug; use p256::pkcs8::EncodePrivateKey; diff --git a/crates/stackable-certs/src/keys/rsa.rs b/crates/stackable-certs/src/keys/rsa.rs index 91b6bda63..68adeb70f 100644 --- a/crates/stackable-certs/src/keys/rsa.rs +++ b/crates/stackable-certs/src/keys/rsa.rs @@ -3,7 +3,7 @@ //! and other certificates. use rand::rngs::SysRng; use rand_core::{CryptoRng, UnwrapErr}; -use rsa::{RsaPrivateKey, pkcs8::DecodePrivateKey}; +use rsa::{PrivateKey, pkcs8::DecodePrivateKey}; use signature::Keypair; use snafu::{ResultExt, Snafu}; use tracing::instrument; @@ -54,7 +54,7 @@ impl SigningKey { where R: CryptoRng + ?Sized, { - let private_key = RsaPrivateKey::new(csprng, KEY_SIZE).context(CreateKeySnafu)?; + let private_key = PrivateKey::new(csprng, KEY_SIZE).context(CreateKeySnafu)?; let signing_key = rsa::pkcs1v15::SigningKey::::new(private_key); Ok(Self(signing_key)) @@ -78,7 +78,7 @@ impl CertificateKeypair for SigningKey { #[instrument(name = "create_rsa_signing_key_from_pkcs8_pem")] fn from_pkcs8_pem(input: &str) -> Result { let private_key = - RsaPrivateKey::from_pkcs8_pem(input).context(DeserializeSigningKeySnafu)?; + PrivateKey::from_pkcs8_pem(input).context(DeserializeSigningKeySnafu)?; let signing_key = rsa::pkcs1v15::SigningKey::::new(private_key); Ok(Self(signing_key)) From a012ad0dbbb8cb254ad15594d13a9c64261a4126 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 9 Nov 2026 09:48:42 +0100 Subject: [PATCH 2/6] changelog --- crates/stackable-certs/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/stackable-certs/CHANGELOG.md b/crates/stackable-certs/CHANGELOG.md index f96690106..6a498e85f 100644 --- a/crates/stackable-certs/CHANGELOG.md +++ b/crates/stackable-certs/CHANGELOG.md @@ -6,9 +6,9 @@ All notable changes to this project will be documented in this file. ### Changed -- Bump `rsa` to 0.10.0, which fixes the Marvin attack (RUSTSEC-2023-0071) ([#XXXX]). +- Bump `rsa` to 0.10.0, which fixes the Marvin attack (RUSTSEC-2023-0071) ([#1327]). -[#XXXX]: https://github.com/stackabletech/operator-rs/pull/XXXX +[#1327]: https://github.com/stackabletech/operator-rs/pull/1327 ## [0.5.0] - 2026-11-03 From 7ef65ef4972636ac60aa733825f256441643c51b Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 9 Nov 2026 09:51:16 +0100 Subject: [PATCH 3/6] Pull in current deny.toml --- deny.toml | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/deny.toml b/deny.toml index 8ec7e4528..e65a24ccc 100644 --- a/deny.toml +++ b/deny.toml @@ -1,6 +1,9 @@ +# This file is automatically generated from the templates in stackabletech/operator-templating +# DO NOT MANUALLY EDIT THIS FILE + # This file is the source of truth for all our repos! # This includes repos not templated by operator-templating, please copy/paste the file for this repos. - +# # TIP: Use "cargo deny check" to check if everything is fine [graph] @@ -18,9 +21,9 @@ ignore = [ # https://rustsec.org/advisories/RUSTSEC-2023-0071 # "rsa" crate: Marvin Attack: potential key recovery through timing sidechannel # - # No patch is yet available, however work is underway to migrate to a fully constant-time implementation - # So we need to accept this, as of SDP 25.3 we are not using the rsa crate to create certificates used in production - # setups. + # No patch is yet available, however work is underway to migrate to a fully constant-time implementation. + # So we need to accept this, as of SDP 26.3 we are "only" using the crate to create private + + # public key pairs used by webhooks, such as conversion or mutating webhooks. # # https://github.com/RustCrypto/RSA/issues/19 is the tracking issue "RUSTSEC-2023-0071", @@ -38,6 +41,32 @@ ignore = [ # # This can only be removed again if we decide to use a different crate. "RUSTSEC-2024-0436", + + # https://rustsec.org/advisories/RUSTSEC-2026-0097 + # rand 0.8.5 is unsound when log+thread_rng features are enabled and a custom logger calls rand::rng(). + # + # This version is pulled in transitively via num-bigint-dig -> rsa -> stackable-certs and cannot be + # updated until the upstream rsa crate bumps its rand dependency. + "RUSTSEC-2026-0097", + + # https://rustsec.org/advisories/RUSTSEC-2026-0173 + # The author of `proc-macro-error2` has [confirmed](https://github.com/GnomedDev/proc-macro-error-2/issues/17#issuecomment-4643215473) + # that the crate is no longer maintained and recommends that users migrate away from it. + # + # There currently is no way for us to negate this advisory, because that crate is not used + # directly by us. We need to wait for new versions of oci-spec and getset. See the following + # issue which tracks moving to a newer getset version: https://github.com/youki-dev/oci-spec-rs/issues/340 + # + # proc-macro-error2 v2.0.1 + # └── getset v0.1.6 + # └── oci-spec v0.9.0 + # └── boil v0.2.1 + # + # Alternate crates are: + # + # - https://crates.io/crates/manyhow + # - https://github.com/SergioBenitez/proc-macro2-diagnostics + "RUSTSEC-2026-0173", ] [bans] @@ -61,6 +90,7 @@ allow = [ "Unicode-DFS-2016", "Zlib", "Unlicense", + "Apache-2.0 WITH LLVM-exception", # Needed for ar_archive_writer crate (transitive dependency) ] private = { ignore = true } From d7ad7ad18e356116e5e2d063f9f35a1c2747c262 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 9 Nov 2026 16:43:06 +0100 Subject: [PATCH 4/6] fmt --- crates/stackable-certs/src/keys/rsa.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/stackable-certs/src/keys/rsa.rs b/crates/stackable-certs/src/keys/rsa.rs index 68adeb70f..2580f22da 100644 --- a/crates/stackable-certs/src/keys/rsa.rs +++ b/crates/stackable-certs/src/keys/rsa.rs @@ -77,8 +77,7 @@ impl CertificateKeypair for SigningKey { #[instrument(name = "create_rsa_signing_key_from_pkcs8_pem")] fn from_pkcs8_pem(input: &str) -> Result { - let private_key = - PrivateKey::from_pkcs8_pem(input).context(DeserializeSigningKeySnafu)?; + let private_key = PrivateKey::from_pkcs8_pem(input).context(DeserializeSigningKeySnafu)?; let signing_key = rsa::pkcs1v15::SigningKey::::new(private_key); Ok(Self(signing_key)) From b3d4bf8bd0bead5069ab58097705b333ef457abe Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 16 Nov 2026 10:04:16 +0100 Subject: [PATCH 5/6] chore: Bump kube and jiff --- Cargo.lock | 193 ++++++++++++++++------- Cargo.toml | 14 +- crates/stackable-operator/src/eos/mod.rs | 14 +- 3 files changed, 148 insertions(+), 73 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c363a6533..dd0dc6814 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -47,9 +47,9 @@ dependencies = [ [[package]] name = "annotate-snippets" -version = "0.12.17" +version = "0.12.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a5b0a5ab8561c603f16c3b78c24a386b1f70e7fc1b1b1e8c15738828e4a176" +checksum = "0258346f92c78dbc5b336b9a5b27c64447aa10643bc64e651db2edb145361564" dependencies = [ "anstyle", "memchr", @@ -118,7 +118,7 @@ dependencies = [ "lazy_static", "murmur3", "once_cell", - "parking_lot", + "parking_lot 0.12.5", "typed-arena", "uuid", ] @@ -140,9 +140,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4c94f57a570fce5d381be3289b3f79aef6332d72948fe82ab5772e423ccf92" +checksum = "84a22b5d51209f6de83d37a0b33d320acb8da88823e42a94c075140708f032a5" dependencies = [ "rustversion", ] @@ -375,9 +375,9 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "cc" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ff2a8126fff0f8c839080d619675a585e61720bb12d2baceae45769fd66f155" +checksum = "33ef9e3e8154a45c7a95cff4c1299702106ad94062d7bb85fdc5d3a5afd91d45" dependencies = [ "find-msvc-tools", "jobserver", @@ -516,9 +516,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" +checksum = "be95d4a884358a21a199689323c29e9256b4a1b315e22f183d155422041d3a9a" [[package]] name = "const_format" @@ -1050,9 +1050,9 @@ checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826" [[package]] name = "errno" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +checksum = "e35d6e78f4cebb90e51d543db8fe41528851d6deeef6ef21ebd4bfdc1e784776" dependencies = [ "libc", "windows-sys 0.61.2", @@ -1400,7 +1400,7 @@ dependencies = [ "idna", "ipnet", "jni", - "rand 0.10.3", + "rand 0.10.4", "thiserror 2.0.21", "tinyvec", "tokio", @@ -1420,7 +1420,7 @@ dependencies = [ "jni", "once_cell", "prefix-trie", - "rand 0.10.3", + "rand 0.10.4", "ring", "thiserror 2.0.21", "tinyvec", @@ -1444,8 +1444,8 @@ dependencies = [ "moka", "ndk-context", "once_cell", - "parking_lot", - "rand 0.10.3", + "parking_lot 0.12.5", + "rand 0.10.4", "resolv-conf", "smallvec", "system-configuration", @@ -1844,12 +1844,26 @@ dependencies = [ [[package]] name = "jiff" -version = "0.2.41" +version = "0.2.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175dc66334db3b9ab9985bf8b61cfed50dc16d20964bb47f9e479adcae984a7f" +dependencies = [ + "jiff-core 0.1.8", + "jiff-static 0.2.46", + "log", + "portable-atomic", + "portable-atomic-util", + "serde_core", +] + +[[package]] +name = "jiff" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcefdcefac59ac8f8401852e3427d55610481fc41e6625c39bac62d2d771623a" +checksum = "9cc767b5763de45e810109520123bb2829a653f3a7ed9be40b2bc4f81158f595" dependencies = [ - "jiff-core", - "jiff-static", + "jiff-core 1.0.0", + "jiff-static 1.0.0", "jiff-tzdb-platform", "log", "portable-atomic", @@ -1860,36 +1874,57 @@ dependencies = [ [[package]] name = "jiff-core" -version = "0.1.4" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a24020db0ee88d1c681d677681bd31f9f4ea189a455425223d52ce4f1508aa" +checksum = "e599b80292e597019b8b3e392de3f4bea2959ddfb8c7dff60e035e9e311a2c1b" +dependencies = [ + "log", +] + +[[package]] +name = "jiff-core" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "894f7ac42105f584100691b3bf6e6b92dd12fcfa225f6c397f95c8a94b47b68f" dependencies = [ "log", ] [[package]] name = "jiff-static" -version = "0.2.41" +version = "0.2.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "203edf9b0ce4083ec8fbf4adc823eac89768ea994b4953fc0dab1b90083234dd" +checksum = "c7b1af7547d47354bc438d797e3854601bde8f8d185780c5ba4ab27afa54f1ba" dependencies = [ - "jiff-core", + "jiff-core 0.1.8", "proc-macro2", "quote", "syn 2.0.119", ] +[[package]] +name = "jiff-static" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955491488dc99b572ea6d67b172dcd98787d00744b1fb44a5689b4e6413695a6" +dependencies = [ + "jiff-core 1.0.0", + "proc-macro2", + "quote", + "syn 3.0.10", +] + [[package]] name = "jiff-tzdb" -version = "0.1.9" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8377070c6bae868759445e5a77f66d84f0b72f3a054bfb00e6d038b8282da7" +checksum = "12e71a1b68a875a44a33bb7a1dd84392cb77145a3367a552a3cfe6a4f5cf3afc" [[package]] name = "jiff-tzdb-platform" -version = "0.1.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" +checksum = "dc65b284afcfa8f6cf189c7274c805505314a7ab975c60e1f548bff56525420e" dependencies = [ "jiff-tzdb", ] @@ -2007,7 +2042,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab0d13801242174b1f3966907c3f32039f2d6b36c7ce82c61225d66ed5d1eb70" dependencies = [ "base64 0.22.1", - "jiff", + "jiff 0.2.46", "schemars", "serde", "serde_json", @@ -2046,9 +2081,9 @@ checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37" [[package]] name = "kube" -version = "5.0.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c73b082f549411623a4f8949bd24dcaedacb1511379c461c76d579fde301d021" +checksum = "ee2daae7debf056a191329a20b5ba6f6de6d437e87d14e586453633b3de04f7f" dependencies = [ "k8s-openapi", "kube-client", @@ -2076,9 +2111,9 @@ dependencies = [ [[package]] name = "kube-client" -version = "5.0.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae56b223bca490db1f1b115bfc606d411177511d7748d8cc019a7e3b2935430b" +checksum = "23c0cbc565d35cd1e1997537a22d386abedc62cc2e7e70f91c08f9928012d845" dependencies = [ "base64 0.23.1", "bytes", @@ -2092,7 +2127,7 @@ dependencies = [ "hyper-timeout", "hyper-util", "ipnet", - "jiff", + "jiff 0.2.46", "jsonpath-rust", "k8s-openapi", "kube-core", @@ -2115,14 +2150,14 @@ dependencies = [ [[package]] name = "kube-core" -version = "5.0.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6de84b47fc1aa35ba0ef9059ef54b47c8b47f0979afd15487e525282f2d73fb9" +checksum = "ca27486a6fbf5e74ec7b411faf1d5bab8a3e489b93f958391c698f27d693014f" dependencies = [ "derive_more", "form_urlencoded", "http", - "jiff", + "jiff 0.2.46", "json-patch", "k8s-openapi", "kube-cel", @@ -2135,9 +2170,9 @@ dependencies = [ [[package]] name = "kube-derive" -version = "5.0.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de1fb46ac34371491ac0277c13e0e1bb9288000e64c86ca3d91343754818e64e" +checksum = "b9f4ad02a27b7385ca9da44d83788aca4f11feeebf2ee57ded3003037051019f" dependencies = [ "darling 0.24.1", "proc-macro2", @@ -2149,9 +2184,9 @@ dependencies = [ [[package]] name = "kube-runtime" -version = "5.0.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dea60005024b6ec1819c426209aa29b9eaca64f6b3988ab73c55f43fa484392" +checksum = "aa7b047ec6a5081f57fcd656308d640a9796d7684f56cc01a7a3131f92050478" dependencies = [ "ahash", "async-broadcast", @@ -2164,7 +2199,7 @@ dependencies = [ "json-patch", "k8s-openapi", "kube-client", - "parking_lot", + "parking_lot 0.13.0", "pin-project", "serde", "serde_json", @@ -2248,6 +2283,15 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lock_api" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65d91b22da179613dcf4d6ec8349563f52a363f6849e03b00dd0a185ec4a59af" +dependencies = [ + "scopeguard", +] + [[package]] name = "log" version = "0.4.35" @@ -2318,7 +2362,7 @@ dependencies = [ "crossbeam-epoch", "crossbeam-utils", "equivalent", - "parking_lot", + "parking_lot 0.12.5", "portable-atomic", "smallvec", "tagptr", @@ -2360,7 +2404,7 @@ dependencies = [ "linux-raw-sys", "log", "neli-proc-macros", - "parking_lot", + "parking_lot 0.12.5", ] [[package]] @@ -2643,8 +2687,18 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ - "lock_api", - "parking_lot_core", + "lock_api 0.4.14", + "parking_lot_core 0.9.12", +] + +[[package]] +name = "parking_lot" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9cf937ca4e1d0b7578784559063422fc39ae7c5a00f02471f2614d5486fd226" +dependencies = [ + "lock_api 0.5.0", + "parking_lot_core 0.10.0", ] [[package]] @@ -2655,7 +2709,19 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.18", + "smallvec", + "windows-link", +] + +[[package]] +name = "parking_lot_core" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cfff060068cc18aa7815010fcaf80c68c7fb9e85fc7f5c0f9bf142c21d19826" +dependencies = [ + "libc", + "redox_syscall 0.9.5", "smallvec", "windows-link", ] @@ -2993,9 +3059,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af" +checksum = "8f6fa277c67e6ea590466f04c3fe82cb509f0864fe470643e5570de9514a9b11" dependencies = [ "chacha20", "getrandom 0.4.3", @@ -3055,6 +3121,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_syscall" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "580c875845b41ecb1564ad1ae4703044cef774145e3d7a94dc2b3fa7c97868fd" +dependencies = [ + "bitflags", +] + [[package]] name = "ref-cast" version = "1.0.27" @@ -3776,7 +3851,7 @@ dependencies = [ "k8s-openapi", "kube", "p256", - "rand 0.10.3", + "rand 0.10.4", "rand_core 0.10.1", "rsa", "sha2", @@ -3807,11 +3882,11 @@ dependencies = [ "indexmap", "indoc", "java-properties", - "jiff", + "jiff 1.0.0", "json-patch", "k8s-openapi", "kube", - "rand 0.10.3", + "rand 0.10.4", "regex", "rstest", "schemars", @@ -3854,7 +3929,7 @@ dependencies = [ name = "stackable-shared" version = "0.2.1" dependencies = [ - "jiff", + "jiff 1.0.0", "k8s-openapi", "kube", "rstest", @@ -3950,7 +4025,7 @@ dependencies = [ "kube", "opentelemetry", "opentelemetry-semantic-conventions", - "rand 0.10.3", + "rand 0.10.4", "serde", "serde_json", "snafu 0.9.2", @@ -4074,9 +4149,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.40.1" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e8a3edbe0394ce115f3917a00349dd242be09eb5a091ed509eaf67b55cfb8a8" +checksum = "a86bac2f7d06e6384984118ad727f5694110f0ec44d924d05c8fdec3d030bee6" dependencies = [ "libc", "memchr", @@ -4617,9 +4692,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "trybuild" -version = "1.0.122" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62db9c92d704393fbf2132041720cc80b689f2d3f28521015c2ac866223c11b8" +checksum = "9838b494ee14d28f1eeea490e8f4f10248fa6dd371d4bc874b635de499408245" dependencies = [ "glob", "serde", @@ -4641,7 +4716,7 @@ dependencies = [ "http", "httparse", "log", - "rand 0.10.3", + "rand 0.10.4", "sha1", "thiserror 2.0.21", ] diff --git a/Cargo.toml b/Cargo.toml index 793de618e..5ff3312fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ edition = "2024" repository = "https://github.com/stackabletech/operator-rs" [workspace.dependencies] -arc-swap = "1.9.4" +arc-swap = "1.9.5" async-trait = "0.1.92" axum = { version = "0.8.9", features = ["http2"] } base16ct = "1.0" @@ -23,7 +23,7 @@ const_format = "0.2.37" # crates. Bumping any of them individually splits the dependency graph into two incompatible halves # and rsa's key and signature types stop satisfying x509-cert's spki traits. # See also the ecdsa, p256, rand_core, rsa, sha2, signature and x509-cert entries below. -const-oid = { version = "0.10.2", features = ["db"] } +const-oid = { version = "0.10.3", features = ["db"] } convert_case = "0.12.0" darling = "0.24.1" delegate = "0.13.5" @@ -39,7 +39,7 @@ http = "1.5.0" humantime = "2.4.0" indexmap = "2.14.2" indoc = "2.0.8" -jiff = "0.2.41" +jiff = "1.0.0" insta = { version = "1.49.0", features = ["glob"] } hyper = { version = "1.12.0", features = ["full"] } hyper-util = "0.1.21" @@ -53,7 +53,7 @@ json-patch = "4.2.0" k8s-openapi = { version = "0.29.0", default-features = false, features = ["schemars", "v1_36"] } # We use rustls instead of openssl for easier portability, e.g. so that we can build stackablectl without the need to vendor (build from source) openssl # We use ring instead of aws-lc-rs, as this currently fails to build in "make run-dev" -kube = { version = "5.0.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "admission", "rustls-tls", "ring"] } +kube = { version = "5.1.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "admission", "rustls-tls", "ring"] } local-ip-address = "0.6.13" opentelemetry = "0.33.1" opentelemetry_sdk = { version = "0.33.1", features = ["rt-tokio"] } @@ -67,7 +67,7 @@ pin-project = "1.1.13" prettyplease = "0.3.0" proc-macro2 = "1.0.107" quote = "1.0.47" -rand = "0.10.3" +rand = "0.10.4" # This crate is independent of the `rand` version above, which is only used to generate random # Secrets in stackable-operator. rand_core = "0.10.1" @@ -90,7 +90,7 @@ snafu = "0.9.2" stackable-operator-derive = { path = "stackable-operator-derive" } strum = { version = "0.28.0", features = ["derive"] } syn = "3.0.10" -sysinfo = "0.40.1" +sysinfo = "0.40.3" tempfile = "3.27.0" time = { version = "0.3.55" } tokio = { version = "1.54.1", features = ["macros", "rt-multi-thread", "fs"] } @@ -103,7 +103,7 @@ tracing = "0.1.44" tracing-appender = "0.2.5" tracing-opentelemetry = "0.34.0" tracing-subscriber = { version = "0.3.23", features = ["env-filter", "json"] } -trybuild = "1.0.122" +trybuild = "1.0.125" url = { version = "2.5.8", features = ["serde"] } uuid = "1.29.2" winnow = "1.0.5" diff --git a/crates/stackable-operator/src/eos/mod.rs b/crates/stackable-operator/src/eos/mod.rs index 26a2b5e90..c9c9321df 100644 --- a/crates/stackable-operator/src/eos/mod.rs +++ b/crates/stackable-operator/src/eos/mod.rs @@ -1,5 +1,5 @@ use futures::FutureExt; -use jiff::{self, Zoned}; +use jiff::{self, ZonedDateTime}; use snafu::{ResultExt, Snafu}; use stackable_shared::time::Duration; use tokio::select; @@ -63,12 +63,12 @@ pub enum EndOfSupportCheckMode { #[derive(Debug, Snafu)] pub enum Error { #[snafu(display("failed to parse built-time"))] - ParseBuiltTime { source: k8s_openapi::jiff::Error }, + ParseBuiltTime { source: jiff::Error }, } pub struct EndOfSupportChecker { - built_datetime: Zoned, - eos_datetime: Zoned, + built_datetime: ZonedDateTime, + eos_datetime: ZonedDateTime, interval: Duration, disabled: bool, } @@ -92,7 +92,7 @@ impl EndOfSupportChecker { // Parse the built-time from the RFC2822-encoded string when this is compiled as a release // build. If this is a debug/dev build, use the current datetime instead. let built_datetime = if cfg!(debug_assertions) { - Zoned::now() + ZonedDateTime::now() } else { jiff::fmt::rfc2822::parse(built_time).context(ParseBuiltTimeSnafu)? }; @@ -140,7 +140,7 @@ impl EndOfSupportChecker { // The first tick ticks immediately. _ = interval.tick() => { - let now = Zoned::now(); + let now = ZonedDateTime::now(); tracing::info_span!( "checking end-of-support state", @@ -163,7 +163,7 @@ impl EndOfSupportChecker { /// Emits the end-of-support warning. #[instrument(level = Level::DEBUG, skip(self))] - fn emit_warning(&self, now: &Zoned) { + fn emit_warning(&self, now: &ZonedDateTime) { let built_datetime = jiff::fmt::rfc2822::to_string(&self.built_datetime) .expect("The build datetime can always be serialized using rfc2822::to_string"); let build_age = Duration::try_from(now - &self.built_datetime) From 37ef70aab91a780a8da4cc3bbc9311b803ecdd2e Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 18 Nov 2026 13:47:21 +0100 Subject: [PATCH 6/6] more bumps --- Cargo.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5ff3312fc..2d93394c3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ axum = { version = "0.8.9", features = ["http2"] } base16ct = "1.0" base64 = "0.23" built = "0.8.1" -clap = { version = "4.6.7", features = ["derive", "cargo", "env"] } +clap = { version = "4.6.8", features = ["derive", "cargo", "env"] } const_format = "0.2.37" # The RustCrypto crates const-oid, ecdsa, p256, rand_core, rsa, sha2, signature and x509-cert have # to be bumped together. `stackable-certs` builds certificates for both ECDSA and RSA keypairs, so @@ -39,7 +39,7 @@ http = "1.5.0" humantime = "2.4.0" indexmap = "2.14.2" indoc = "2.0.8" -jiff = "1.0.0" +jiff = "1.0.1" insta = { version = "1.49.0", features = ["glob"] } hyper = { version = "1.12.0", features = ["full"] } hyper-util = "0.1.21" @@ -71,7 +71,7 @@ rand = "0.10.4" # This crate is independent of the `rand` version above, which is only used to generate random # Secrets in stackable-operator. rand_core = "0.10.1" -regex = "1.13.1" +regex = "1.13.2" # Part of the RustCrypto ecosystem, see the const-oid comment above rsa = { version = "0.10.0", features = ["pkcs1v15"] } rstest = "0.28.0" @@ -90,7 +90,7 @@ snafu = "0.9.2" stackable-operator-derive = { path = "stackable-operator-derive" } strum = { version = "0.28.0", features = ["derive"] } syn = "3.0.10" -sysinfo = "0.40.3" +sysinfo = "0.40.4" tempfile = "3.27.0" time = { version = "0.3.55" } tokio = { version = "1.54.1", features = ["macros", "rt-multi-thread", "fs"] } @@ -105,12 +105,12 @@ tracing-opentelemetry = "0.34.0" tracing-subscriber = { version = "0.3.23", features = ["env-filter", "json"] } trybuild = "1.0.125" url = { version = "2.5.8", features = ["serde"] } -uuid = "1.29.2" +uuid = "1.29.3" winnow = "1.0.5" # Part of the RustCrypto ecosystem, see the const-oid comment above. x509-cert = { version = "0.3.0", features = ["builder"] } xml = "1.4.0" -zeroize = "1.9.1" +zeroize = "1.9.2" [workspace.lints.clippy] # Enable all pedantic lints (with lower priority so individual lints can override)