diff --git a/0200-rust-keylime-bump-tss-esapi.patch b/0200-rust-keylime-bump-tss-esapi.patch new file mode 100644 index 0000000..1b96545 --- /dev/null +++ b/0200-rust-keylime-bump-tss-esapi.patch @@ -0,0 +1,713 @@ +diff --git a/Cargo.toml b/Cargo.toml +index e52ad57..ab39a8e 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -39,8 +39,8 @@ once_cell = "1.19.0" + openssl = "0.10.15" + pest = "2" + pest_derive = "2" +-picky-asn1-der = "0.4" +-picky-asn1-x509 = "0.12" ++picky-asn1-der = "0.5" ++picky-asn1-x509 = "0.15" + predicates = { version = "3.1.3" } + pretty_env_logger = "0.5" + rand = "0.9.2" +@@ -56,7 +56,7 @@ static_assertions = "1" + tempfile = "3.4.0" + thiserror = "2.0" + tokio = {version = "1", features = ["rt", "sync", "macros"]} +-tss-esapi = {version = "7.6.0", features = ["generate-bindings"]} ++tss-esapi = {version = "7.7.0", features = ["generate-bindings"]} + url = "2.5.4" + uuid = {version = "1.3", features = ["v4"]} + zip = {version = "0.6", default-features = false, features= ["deflate"]} +diff --git a/Cargo.lock b/Cargo.lock +index 516097c..d466f3f 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -30,7 +30,7 @@ dependencies = [ + "actix-service", + "actix-tls", + "actix-utils", +- "bitflags 2.4.0", ++ "bitflags 2.11.1", + "bytes", + "bytestring", + "derive_more", +@@ -343,12 +343,6 @@ dependencies = [ + "windows-targets 0.52.6", + ] + +-[[package]] +-name = "base64" +-version = "0.21.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +- + [[package]] + name = "base64" + version = "0.22.1" +@@ -357,17 +351,15 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + + [[package]] + name = "bindgen" +-version = "0.66.1" ++version = "0.72.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" ++checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" + dependencies = [ +- "bitflags 2.4.0", ++ "bitflags 2.11.1", + "cexpr", + "clang-sys", +- "lazy_static", +- "lazycell", ++ "itertools", + "log", +- "peeking_take_while", + "prettyplease", + "proc-macro2", + "quote", +@@ -375,14 +367,27 @@ dependencies = [ + "rustc-hash", + "shlex", + "syn 2.0.106", +- "which", + ] + + [[package]] + name = "bitfield" +-version = "0.14.0" ++version = "0.19.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "21ba6517c6b0f2bf08be60e187ab64b038438f22dd755614d8fe4d4098c46419" ++dependencies = [ ++ "bitfield-macros", ++] ++ ++[[package]] ++name = "bitfield-macros" ++version = "0.19.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" ++checksum = "f48d6ace212fdf1b45fd6b566bb40808415344642b76c3224c07c8df9da81e97" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.106", ++] + + [[package]] + name = "bitflags" +@@ -392,9 +397,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] + name = "bitflags" +-version = "2.4.0" ++version = "2.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" ++checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" + + [[package]] + name = "block-buffer" +@@ -721,15 +726,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" + dependencies = [ + "libc", +- "windows-sys 0.52.0", ++ "windows-sys 0.59.0", + ] + +-[[package]] +-name = "error-chain" +-version = "0.10.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8" +- + [[package]] + name = "fastrand" + version = "2.2.0" +@@ -902,10 +901,23 @@ checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" + dependencies = [ + "cfg-if", + "libc", +- "r-efi", ++ "r-efi 5.2.0", + "wasi 0.14.2+wasi-0.2.4", + ] + ++[[package]] ++name = "getrandom" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "r-efi 6.0.0", ++ "wasip2", ++ "wasip3", ++] ++ + [[package]] + name = "gimli" + version = "0.31.1" +@@ -961,6 +973,9 @@ name = "hashbrown" + version = "0.15.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" ++dependencies = [ ++ "foldhash", ++] + + [[package]] + name = "heck" +@@ -1102,7 +1117,7 @@ version = "0.1.20" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" + dependencies = [ +- "base64 0.22.1", ++ "base64", + "bytes", + "futures-channel", + "futures-util", +@@ -1261,6 +1276,12 @@ dependencies = [ + "syn 2.0.106", + ] + ++[[package]] ++name = "id-arena" ++version = "2.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" ++ + [[package]] + name = "idna" + version = "1.0.3" +@@ -1296,6 +1317,7 @@ checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9" + dependencies = [ + "equivalent", + "hashbrown", ++ "serde", + ] + + [[package]] +@@ -1331,6 +1353,15 @@ version = "1.70.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + ++[[package]] ++name = "itertools" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" ++dependencies = [ ++ "either", ++] ++ + [[package]] + name = "itoa" + version = "1.0.3" +@@ -1355,7 +1386,7 @@ dependencies = [ + "actix-web", + "anyhow", + "async-trait", +- "base64 0.22.1", ++ "base64", + "byteorder", + "chrono", + "config", +@@ -1385,7 +1416,6 @@ dependencies = [ + "uuid", + "wiremock", + "zip", +- "zmq", + ] + + [[package]] +@@ -1404,7 +1434,7 @@ version = "0.2.9" + dependencies = [ + "actix-rt", + "actix-web", +- "base64 0.22.1", ++ "base64", + "cfg-if", + "clap", + "config", +@@ -1423,7 +1453,6 @@ dependencies = [ + "tss-esapi", + "uuid", + "zip", +- "zmq", + ] + + [[package]] +@@ -1476,10 +1505,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + + [[package]] +-name = "lazycell" +-version = "1.3.0" ++name = "leb128fmt" ++version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" ++checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + + [[package]] + name = "libc" +@@ -1547,17 +1576,6 @@ version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +-[[package]] +-name = "metadeps" +-version = "1.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "73b122901b3a675fac8cecf68dcb2f0d3036193bc861d1ac0e1c337f7d5254c2" +-dependencies = [ +- "error-chain", +- "pkg-config", +- "toml 0.2.1", +-] +- + [[package]] + name = "mime" + version = "0.3.16" +@@ -1633,7 +1651,7 @@ version = "0.50.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" + dependencies = [ +- "windows-sys 0.59.0", ++ "windows-sys 0.61.2", + ] + + [[package]] +@@ -1702,7 +1720,7 @@ version = "0.10.73" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" + dependencies = [ +- "bitflags 2.4.0", ++ "bitflags 2.11.1", + "cfg-if", + "foreign-types", + "libc", +@@ -1775,12 +1793,6 @@ version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +-[[package]] +-name = "peeking_take_while" +-version = "0.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +- + [[package]] + name = "percent-encoding" + version = "2.3.1" +@@ -1833,9 +1845,9 @@ dependencies = [ + + [[package]] + name = "picky-asn1" +-version = "0.8.0" ++version = "0.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "295eea0f33c16be21e2a98b908fdd4d73c04dd48c8480991b76dbcf0cb58b212" ++checksum = "2ff038f9360b934342fb3c0a1d6e82c438a2624b51c3c6e3e6d7cf252b6f3ee3" + dependencies = [ + "oid", + "serde", +@@ -1844,9 +1856,9 @@ dependencies = [ + + [[package]] + name = "picky-asn1-der" +-version = "0.4.1" ++version = "0.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5df7873a9e36d42dadb393bea5e211fe83d793c172afad5fb4ec846ec582793f" ++checksum = "d413165e4bf7f808b9a27cbaba657657a2921f0965db833f488c4d4be96dcd2e" + dependencies = [ + "picky-asn1", + "serde", +@@ -1855,11 +1867,11 @@ dependencies = [ + + [[package]] + name = "picky-asn1-x509" +-version = "0.12.0" ++version = "0.15.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2c5f20f71a68499ff32310f418a6fad8816eac1a2859ed3f0c5c741389dd6208" ++checksum = "859d4117bd1b1dc5646359ee7243c50c5000c0920ea2d1fb120335a2f4c684b8" + dependencies = [ +- "base64 0.21.7", ++ "base64", + "oid", + "picky-asn1", + "picky-asn1-der", +@@ -1908,9 +1920,9 @@ dependencies = [ + + [[package]] + name = "prettyplease" +-version = "0.2.16" ++version = "0.2.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" ++checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" + dependencies = [ + "proc-macro2", + "syn 2.0.106", +@@ -1918,9 +1930,9 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.92" ++version = "1.0.106" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" ++checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" + dependencies = [ + "unicode-ident", + ] +@@ -1940,6 +1952,12 @@ version = "5.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + ++[[package]] ++name = "r-efi" ++version = "6.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" ++ + [[package]] + name = "rand" + version = "0.9.2" +@@ -2007,7 +2025,7 @@ version = "0.13.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" + dependencies = [ +- "base64 0.22.1", ++ "base64", + "bytes", + "futures-core", + "http 1.4.0", +@@ -2088,9 +2106,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + + [[package]] + name = "rustc-hash" +-version = "1.1.0" ++version = "2.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" ++checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" + + [[package]] + name = "rustix" +@@ -2098,11 +2116,11 @@ version = "1.0.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" + dependencies = [ +- "bitflags 2.4.0", ++ "bitflags 2.11.1", + "errno", + "libc", + "linux-raw-sys", +- "windows-sys 0.52.0", ++ "windows-sys 0.59.0", + ] + + [[package]] +@@ -2161,6 +2179,12 @@ dependencies = [ + "libc", + ] + ++[[package]] ++name = "semver" ++version = "1.0.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" ++ + [[package]] + name = "serde" + version = "1.0.228" +@@ -2553,12 +2577,6 @@ dependencies = [ + "tracing", + ] + +-[[package]] +-name = "toml" +-version = "0.2.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4" +- + [[package]] + name = "toml" + version = "0.5.9" +@@ -2628,7 +2646,7 @@ version = "0.6.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" + dependencies = [ +- "bitflags 2.4.0", ++ "bitflags 2.11.1", + "bytes", + "futures-util", + "http 1.4.0", +@@ -2734,13 +2752,13 @@ dependencies = [ + + [[package]] + name = "tss-esapi" +-version = "7.6.0" ++version = "7.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "78ea9ccde878b029392ac97b5be1f470173d06ea41d18ad0bb3c92794c16a0f2" ++checksum = "3f10b25a84912b894d0e6d68f4a3771c923e9c44ddaaed7920cde92ed28aa84e" + dependencies = [ + "bitfield", + "enumflags2", +- "getrandom 0.2.16", ++ "getrandom 0.4.2", + "hostname-validator", + "log", + "mbox", +@@ -2757,9 +2775,9 @@ dependencies = [ + + [[package]] + name = "tss-esapi-sys" +-version = "0.5.0" ++version = "0.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "535cd192581c2ec4d5f82e670b1d3fbba6a23ccce8c85de387642051d7cad5b5" ++checksum = "a7f972672926a3d3d18ecc04524720e4d20b7d1664a3fb73dbf7d4274196dbd9" + dependencies = [ + "bindgen", + "pkg-config", +@@ -2873,6 +2891,24 @@ dependencies = [ + "wit-bindgen-rt", + ] + ++[[package]] ++name = "wasip2" ++version = "1.0.3+wasi-0.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" ++dependencies = [ ++ "wit-bindgen 0.57.1", ++] ++ ++[[package]] ++name = "wasip3" ++version = "0.4.0+wasi-0.3.0-rc-2026-01-06" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" ++dependencies = [ ++ "wit-bindgen 0.51.0", ++] ++ + [[package]] + name = "wasm-bindgen" + version = "0.2.100" +@@ -2943,6 +2979,40 @@ dependencies = [ + "unicode-ident", + ] + ++[[package]] ++name = "wasm-encoder" ++version = "0.244.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" ++dependencies = [ ++ "leb128fmt", ++ "wasmparser", ++] ++ ++[[package]] ++name = "wasm-metadata" ++version = "0.244.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" ++dependencies = [ ++ "anyhow", ++ "indexmap", ++ "wasm-encoder", ++ "wasmparser", ++] ++ ++[[package]] ++name = "wasmparser" ++version = "0.244.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" ++dependencies = [ ++ "bitflags 2.11.1", ++ "hashbrown", ++ "indexmap", ++ "semver", ++] ++ + [[package]] + name = "wasmtimer" + version = "0.4.3" +@@ -2967,17 +3037,6 @@ dependencies = [ + "wasm-bindgen", + ] + +-[[package]] +-name = "which" +-version = "4.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +-dependencies = [ +- "either", +- "libc", +- "once_cell", +-] +- + [[package]] + name = "winapi" + version = "0.3.9" +@@ -3361,7 +3420,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "08db1edfb05d9b3c1542e521aea074442088292f00b5f28e435c714a98f85031" + dependencies = [ + "assert-json-diff", +- "base64 0.22.1", ++ "base64", + "deadpool", + "futures", + "http 1.4.0", +@@ -3377,13 +3436,107 @@ dependencies = [ + "url", + ] + ++[[package]] ++name = "wit-bindgen" ++version = "0.51.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" ++dependencies = [ ++ "wit-bindgen-rust-macro", ++] ++ ++[[package]] ++name = "wit-bindgen" ++version = "0.57.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" ++ ++[[package]] ++name = "wit-bindgen-core" ++version = "0.51.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" ++dependencies = [ ++ "anyhow", ++ "heck", ++ "wit-parser", ++] ++ + [[package]] + name = "wit-bindgen-rt" + version = "0.39.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" + dependencies = [ +- "bitflags 2.4.0", ++ "bitflags 2.11.1", ++] ++ ++[[package]] ++name = "wit-bindgen-rust" ++version = "0.51.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" ++dependencies = [ ++ "anyhow", ++ "heck", ++ "indexmap", ++ "prettyplease", ++ "syn 2.0.106", ++ "wasm-metadata", ++ "wit-bindgen-core", ++ "wit-component", ++] ++ ++[[package]] ++name = "wit-bindgen-rust-macro" ++version = "0.51.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" ++dependencies = [ ++ "anyhow", ++ "prettyplease", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.106", ++ "wit-bindgen-core", ++ "wit-bindgen-rust", ++] ++ ++[[package]] ++name = "wit-component" ++version = "0.244.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" ++dependencies = [ ++ "anyhow", ++ "bitflags 2.11.1", ++ "indexmap", ++ "log", ++ "serde", ++ "serde_derive", ++ "serde_json", ++ "wasm-encoder", ++ "wasm-metadata", ++ "wasmparser", ++ "wit-parser", ++] ++ ++[[package]] ++name = "wit-parser" ++version = "0.244.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" ++dependencies = [ ++ "anyhow", ++ "id-arena", ++ "indexmap", ++ "log", ++ "semver", ++ "serde", ++ "serde_derive", ++ "serde_json", ++ "unicode-xid", ++ "wasmparser", + ] + + [[package]] +@@ -3497,25 +3650,3 @@ dependencies = [ + "crossbeam-utils", + "flate2", + ] +- +-[[package]] +-name = "zmq" +-version = "0.9.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aad98a7a617d608cd9e1127147f630d24af07c7cd95ba1533246d96cbdd76c66" +-dependencies = [ +- "bitflags 1.3.2", +- "libc", +- "log", +- "zmq-sys", +-] +- +-[[package]] +-name = "zmq-sys" +-version = "0.11.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d33a2c51dde24d5b451a2ed4b488266df221a5eaee2ee519933dc46b9a9b3648" +-dependencies = [ +- "libc", +- "metadeps", +-] diff --git a/keylime-agent-rust.spec b/keylime-agent-rust.spec index 5fce5d3..2e59048 100644 --- a/keylime-agent-rust.spec +++ b/keylime-agent-rust.spec @@ -65,6 +65,9 @@ Patch3: 0003-rust-keylime-registrar-tls-port.patch ## (100-199) Patches for building from system Rust libraries (Fedora) ## (200+) Patches for building from vendored Rust libraries (RHEL) +# Bump tss-esapi to version 7.7.0 to fix build with clang 22 +# Backported from https://github.com/keylime/rust-keylime/pull/1236 +Patch200: 0200-rust-keylime-bump-tss-esapi.patch ExclusiveArch: %{rust_arches} @@ -173,8 +176,7 @@ The Keylime IMA emulator for testing with emulated TPM %if 0%{?bundled_rust_deps} # Source1 is vendored dependencies %cargo_prep -v vendor -# Add back the line below if patches are added (do not forget the '%') -# autopatch -m 200 -p1 +%autopatch -m 200 -p1 %else # Add back the line below if patches are added (do not forget the '%') # autopatch -m 100 -M 199 -p1 diff --git a/sources b/sources index 386cd23..f784b3b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (v0.2.9.tar.gz) = f51ce187462278328a96a05dfb6315167bd3be154cb1c9ad933de33d246e696b25bb487071a824ed552456016bb64154e89f5f8a0dc76b94eb896be0f4787e9f -SHA512 (rust-keylime-0.2.9-vendor.tar.zstd) = 86899e58a2ba7a26c29ba15b6c7bca51dd4500ade8468a2f1697e6b23feb2e2be2e5323b8fc351e3c04aa970dfb07b909c07349f822358b33d439a40f4ab596b +SHA512 (rust-keylime-0.2.9-vendor.tar.zstd) = 6bd6b38697cde0a5220d21620efb459b04a40f04ef60dc0520fac52971c5ffc3665e7d75f303e63979896b43012087b7be3e4a5149d4bedf7c6167321e2b4e3d