Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rust-keylime for openSUSE:Factory checked in at 2023-05-03 12:56:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rust-keylime (Old) and /work/SRC/openSUSE:Factory/.rust-keylime.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rust-keylime" Wed May 3 12:56:22 2023 rev:14 rq:1083982 version:0.2.1+git.1682587333.b497f1d Changes: -------- --- /work/SRC/openSUSE:Factory/rust-keylime/rust-keylime.changes 2023-04-15 22:32:22.705271829 +0200 +++ /work/SRC/openSUSE:Factory/.rust-keylime.new.1533/rust-keylime.changes 2023-05-03 12:56:27.531543971 +0200 @@ -1,0 +2,21 @@ +Thu Apr 27 09:34:45 UTC 2023 - [email protected] + +- Update to version 0.2.1+git.1682587333.b497f1d: + * Bump version to 0.2.1 + * Cargo: Update base64 to version 0.21 + * build(deps): bump enumflags2 from 0.7.5 to 0.7.7 + * build(deps): bump uuid from 1.3.0 to 1.3.1 + * build(deps): bump libc from 0.2.141 to 0.2.142 + * keylime-agent/src/common.rs: remove VTPM and IMA stub variables + * rpm/fedora: Use vendored dependencies for all versions + * packit: Enable building RPM on Copr for fedora-all + * rpm/fedora: Fix metadata patch + * build(deps): bump serde from 1.0.159 to 1.0.160 + * build(deps): bump serde_json from 1.0.95 to 1.0.96 + * cargo: Drop default features from actix-web + * cargo: Drop default features from reqwest crate + * cargo: Drop default features from config crate + * build(deps): bump tempfile from 3.4.0 to 3.5.0 + * build(deps): bump libc from 0.2.140 to 0.2.141 + +------------------------------------------------------------------- Old: ---- rust-keylime-0.2.0+git.1681457715.54484b7.tar.xz New: ---- rust-keylime-0.2.1+git.1682587333.b497f1d.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rust-keylime.spec ++++++ --- /var/tmp/diff_new_pack.WFaAzb/_old 2023-05-03 12:56:28.899552009 +0200 +++ /var/tmp/diff_new_pack.WFaAzb/_new 2023-05-03 12:56:28.903552032 +0200 @@ -25,7 +25,7 @@ %define _config_norepl %config(noreplace) %endif Name: rust-keylime -Version: 0.2.0+git.1681457715.54484b7 +Version: 0.2.1+git.1682587333.b497f1d Release: 0 Summary: Rust implementation of the keylime agent License: Apache-2.0 AND MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.WFaAzb/_old 2023-05-03 12:56:28.991552549 +0200 +++ /var/tmp/diff_new_pack.WFaAzb/_new 2023-05-03 12:56:28.995552573 +0200 @@ -1,6 +1,6 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="versionformat">0.2.0+git.%ct.%h</param> + <param name="versionformat">0.2.1+git.%ct.%h</param> <param name="revision">master</param> <param name="url">https://github.com/keylime/rust-keylime.git</param> <param name="scm">git</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.WFaAzb/_old 2023-05-03 12:56:29.019552714 +0200 +++ /var/tmp/diff_new_pack.WFaAzb/_new 2023-05-03 12:56:29.019552714 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/keylime/rust-keylime.git</param> - <param name="changesrevision">54484b7f0488d6bdf6f1d93a64027385829c251c</param></service></servicedata> + <param name="changesrevision">b497f1d9638be6c41b56aaa6855faf7f71c13651</param></service></servicedata> (No newline at EOF) ++++++ rust-keylime-0.2.0+git.1681457715.54484b7.tar.xz -> rust-keylime-0.2.1+git.1682587333.b497f1d.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust-keylime-0.2.0+git.1681457715.54484b7/.packit.yaml new/rust-keylime-0.2.1+git.1682587333.b497f1d/.packit.yaml --- old/rust-keylime-0.2.0+git.1681457715.54484b7/.packit.yaml 2023-04-14 09:35:15.000000000 +0200 +++ new/rust-keylime-0.2.1+git.1682587333.b497f1d/.packit.yaml 2023-04-27 11:22:13.000000000 +0200 @@ -44,8 +44,7 @@ --exclude-crate-path "libloading#tests" && tar jcf rpm/fedora/rust-keylime-vendor.tar.xz vendor' targets: - - fedora-stable -# - fedora-rawhide + - fedora-all - job: copr_build trigger: commit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust-keylime-0.2.0+git.1681457715.54484b7/Cargo.lock new/rust-keylime-0.2.1+git.1682587333.b497f1d/Cargo.lock --- old/rust-keylime-0.2.0+git.1681457715.54484b7/Cargo.lock 2023-04-14 09:35:15.000000000 +0200 +++ new/rust-keylime-0.2.1+git.1682587333.b497f1d/Cargo.lock 2023-04-27 11:22:13.000000000 +0200 @@ -33,12 +33,10 @@ "ahash 0.8.3", "base64 0.21.0", "bitflags", - "brotli", "bytes", "bytestring", "derive_more", "encoding_rs", - "flate2", "futures-core", "h2", "http", @@ -56,7 +54,6 @@ "tokio", "tokio-util", "tracing", - "zstd", ] [[package]] @@ -170,7 +167,6 @@ "bytes", "bytestring", "cfg-if", - "cookie", "derive_more", "encoding_rs", "futures-core", @@ -205,12 +201,6 @@ ] [[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] name = "ahash" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -243,21 +233,6 @@ ] [[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] name = "anyhow" version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -301,7 +276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -368,27 +343,6 @@ ] [[package]] -name = "brotli" -version = "3.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] name = "bumpalo" version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -420,9 +374,6 @@ version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" -dependencies = [ - "jobserver", -] [[package]] name = "cexpr" @@ -517,16 +468,11 @@ checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7" dependencies = [ "async-trait", - "json5", "lazy_static", "nom", "pathdiff", - "ron", - "rust-ini", "serde", - "serde_json", "toml 0.5.9", - "yaml-rust", ] [[package]] @@ -536,33 +482,6 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] -name = "cookie" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "344adc371239ef32293cb1c4fe519592fcf21206c79c02854320afcdf3ab4917" -dependencies = [ - "percent-encoding", - "time", - "version_check", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] name = "cpufeatures" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -572,15 +491,6 @@ ] [[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -633,12 +543,6 @@ ] [[package]] -name = "dlv-list" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" - -[[package]] name = "either" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -655,22 +559,22 @@ [[package]] name = "enumflags2" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 1.0.100", + "syn 2.0.11", ] [[package]] @@ -688,13 +592,13 @@ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -729,16 +633,6 @@ ] [[package]] -name = "flate2" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -940,9 +834,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", -] [[package]] name = "heck" @@ -960,6 +851,12 @@ ] [[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1060,19 +957,6 @@ ] [[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] name = "idna" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1109,12 +993,13 @@ [[package]] name = "io-lifetimes" -version = "1.0.4" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ + "hermit-abi 0.3.1", "libc", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -1130,15 +1015,6 @@ checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" [[package]] -name = "jobserver" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" -dependencies = [ - "libc", -] - -[[package]] name = "js-sys" version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1148,21 +1024,10 @@ ] [[package]] -name = "json5" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" -dependencies = [ - "pest", - "pest_derive", - "serde", -] - -[[package]] name = "keylime" -version = "0.2.0" +version = "0.2.1" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "hex", "log", "openssl", @@ -1176,11 +1041,11 @@ [[package]] name = "keylime_agent" -version = "0.2.0" +version = "0.2.1" dependencies = [ "actix-rt", "actix-web", - "base64 0.13.1", + "base64 0.21.0", "cfg-if", "clap", "compress-tools", @@ -1211,7 +1076,7 @@ [[package]] name = "keylime_ima_emulator" -version = "0.2.0" +version = "0.2.1" dependencies = [ "clap", "hex", @@ -1243,9 +1108,9 @@ [[package]] name = "libc" -version = "0.2.140" +version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] name = "libloading" @@ -1258,16 +1123,10 @@ ] [[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "local-channel" @@ -1347,15 +1206,6 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - -[[package]] name = "mio" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1368,24 +1218,6 @@ ] [[package]] -name = "native-tls" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] name = "nom" version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1421,7 +1253,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", ] @@ -1476,12 +1308,6 @@ ] [[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] name = "openssl-sys" version = "0.9.83" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1495,16 +1321,6 @@ ] [[package]] -name = "ordered-multimap" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" -dependencies = [ - "dlv-list", - "hashbrown", -] - -[[package]] name = "os_str_bytes" version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1534,7 +1350,7 @@ dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "windows-sys 0.36.1", ] @@ -1574,40 +1390,6 @@ ] [[package]] -name = "pest_derive" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "502b62a6d0245378b04ffe0a7fb4f4419a4815fce813bd8a0ec89a56e07d67b1" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "451e629bf49b750254da26132f1a5a9d11fd8a95a3df51d15c4abd1ba154cb6c" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 1.0.100", -] - -[[package]] -name = "pest_meta" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "bcec162c71c45e269dfc3fc2916eaeb97feab22993a21bcce4721d08cd7801a6" -dependencies = [ - "once_cell", - "pest", - "sha1", -] - -[[package]] name = "picky-asn1" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1827,6 +1609,15 @@ ] [[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + +[[package]] name = "regex" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1858,12 +1649,10 @@ "http", "http-body", "hyper", - "hyper-tls", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -1871,7 +1660,6 @@ "serde_json", "serde_urlencoded", "tokio", - "tokio-native-tls", "tower-service", "url", "wasm-bindgen", @@ -1887,27 +1675,6 @@ checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" [[package]] -name = "ron" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" -dependencies = [ - "base64 0.13.1", - "bitflags", - "serde", -] - -[[package]] -name = "rust-ini" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" -dependencies = [ - "cfg-if", - "ordered-multimap", -] - -[[package]] name = "rustc-hash" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1933,16 +1700,16 @@ [[package]] name = "rustix" -version = "0.36.7" +version = "0.37.11" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" +checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -1952,45 +1719,12 @@ checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" [[package]] -name = "schannel" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -dependencies = [ - "lazy_static", - "windows-sys 0.36.1", -] - -[[package]] name = "scopeguard" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "security-framework" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] name = "semver" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -2016,9 +1750,9 @@ [[package]] name = "serde" -version = "1.0.159" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] @@ -2034,9 +1768,9 @@ [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", @@ -2045,9 +1779,9 @@ [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -2198,15 +1932,15 @@ [[package]] name = "tempfile" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", + "redox_syscall 0.3.5", "rustix", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -2253,16 +1987,9 @@ "itoa", "libc", "num_threads", - "time-macros", ] [[package]] -name = "time-macros" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" - -[[package]] name = "tinyvec" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -2296,16 +2023,6 @@ ] [[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] name = "tokio-openssl" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -2465,9 +2182,9 @@ [[package]] name = "uuid" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb" dependencies = [ "getrandom 0.2.7", ] @@ -2649,20 +2366,74 @@ source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" @@ -2672,9 +2443,15 @@ [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" @@ -2684,9 +2461,15 @@ [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" @@ -2696,9 +2479,15 @@ [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" @@ -2708,15 +2497,27 @@ [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" @@ -2726,9 +2527,15 @@ [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winreg" @@ -2762,15 +2569,6 @@ ] [[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] name = "zeroize" version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -2812,33 +2610,3 @@ "libc", "metadeps", ] - -[[package]] -name = "zstd" -version = "0.12.3+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "6.0.4+zstd.1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "7afb4b54b8910cf5447638cb54bf4e8a65cbedd783af98b98c62ffe91f185543" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" -dependencies = [ - "cc", - "libc", - "pkg-config", -] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime/Cargo.toml new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime/Cargo.toml --- old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime/Cargo.toml 2023-04-14 09:35:15.000000000 +0200 +++ new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime/Cargo.toml 2023-04-27 11:22:13.000000000 +0200 @@ -1,12 +1,12 @@ [package] name = "keylime" -version = "0.2.0" +version = "0.2.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -base64 = "0.13" +base64 = "0.21" hex = "0.4" log = "0.4" openssl = "0.10.15" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime/src/tpm.rs new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime/src/tpm.rs --- old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime/src/tpm.rs 2023-04-14 09:35:15.000000000 +0200 +++ new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime/src/tpm.rs 2023-04-27 11:22:13.000000000 +0200 @@ -2,6 +2,7 @@ // Copyright 2021 Keylime Authors use crate::algorithms::{EncryptionAlgorithm, HashAlgorithm, SignAlgorithm}; +use base64::{engine::general_purpose, Engine as _}; use log::*; use std::convert::{TryFrom, TryInto}; use std::str::FromStr; @@ -560,9 +561,9 @@ let pcr_vec = pcrdata_to_vec(pcrs_read, pcr_data); // base64 encoding - let att_str = base64::encode(att_vec); - let sig_str = base64::encode(sig_vec); - let pcr_str = base64::encode(pcr_vec); + let att_str = general_purpose::STANDARD.encode(att_vec); + let sig_str = general_purpose::STANDARD.encode(sig_vec); + let pcr_str = general_purpose::STANDARD.encode(pcr_vec); // create concatenated string let mut quote = String::new(); @@ -833,9 +834,9 @@ let pcr_str = split.next().ok_or(TpmError::InvalidRequest)?; // base64 decoding - let att_comp_finished = base64::decode(att_str)?; - let sig_comp_finished = base64::decode(sig_str)?; - let pcr_comp_finished = base64::decode(pcr_str)?; + let att_comp_finished = general_purpose::STANDARD.decode(att_str)?; + let sig_comp_finished = general_purpose::STANDARD.decode(sig_str)?; + let pcr_comp_finished = general_purpose::STANDARD.decode(pcr_str)?; let sig: Signature = vec_to_sig(&sig_comp_finished)?.try_into()?; let (pcrsel, pcrdata) = vec_to_pcrdata(&pcr_comp_finished)?; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-agent/Cargo.toml new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-agent/Cargo.toml --- old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-agent/Cargo.toml 2023-04-14 09:35:15.000000000 +0200 +++ new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-agent/Cargo.toml 2023-04-27 11:22:13.000000000 +0200 @@ -2,18 +2,18 @@ authors = ["Keylime Authors"] edition = "2021" name = "keylime_agent" -version = "0.2.0" +version = "0.2.1" license = "Apache-2.0" description = "Rust agent for Keylime" repository = "https://github.com/keylime/rust-keylime"; [dependencies] -actix-web = { version = "4", features = ["openssl"] } -base64 = "0.13" +actix-web = { version = "4", default-features = false, features = ["macros", "openssl"] } +base64 = "0.21" cfg-if = "1" clap = { version = "3.2", features = ["derive"] } compress-tools = "0.12" -config = { version = "0.13", features = ["toml"] } +config = { version = "0.13", default-features = false, features = ["toml"] } futures = "0.3.6" glob = "0.3" hex = "0.4" @@ -24,7 +24,7 @@ picky-asn1-der = "0.3.1" picky-asn1-x509 = "0.6.1" pretty_env_logger = "0.4" -reqwest = {version = "0.11", features = ["json"]} +reqwest = {version = "0.11", default-features = false, features = ["json"]} serde = "1.0.80" serde_derive = "1.0.80" serde_json = { version = "1.0", features = ["raw_value"] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-agent/src/common.rs new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-agent/src/common.rs --- old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-agent/src/common.rs 2023-04-14 09:35:15.000000000 +0200 +++ new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-agent/src/common.rs 2023-04-27 11:22:13.000000000 +0200 @@ -36,8 +36,6 @@ * Constants and static variables */ pub const API_VERSION: &str = "v2.0"; -pub const STUB_VTPM: bool = false; -pub const STUB_IMA: bool = true; pub const TPM_DATA_PCR: usize = 16; pub const IMA_PCR: usize = 10; pub static RSA_PUBLICKEY_EXPORTABLE: &str = "rsa placeholder"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-agent/src/crypto.rs new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-agent/src/crypto.rs --- old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-agent/src/crypto.rs 2023-04-14 09:35:15.000000000 +0200 +++ new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-agent/src/crypto.rs 2023-04-27 11:22:13.000000000 +0200 @@ -1,6 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 // Copyright 2021 Keylime Authors +use base64::{engine::general_purpose, Engine as _}; use openssl::{ asn1::Asn1Time, encrypt::Decrypter, @@ -244,7 +245,8 @@ verifier .set_rsa_pss_saltlen(openssl::sign::RsaPssSaltlen::MAXIMUM_LENGTH)?; verifier.update(message.as_bytes())?; - Ok(verifier.verify(&base64::decode(signature.as_bytes())?)?) + Ok(verifier + .verify(&general_purpose::STANDARD.decode(signature.as_bytes())?)?) } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-agent/src/keys_handler.rs new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-agent/src/keys_handler.rs --- old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-agent/src/keys_handler.rs 2023-04-14 09:35:15.000000000 +0200 +++ new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-agent/src/keys_handler.rs 2023-04-27 11:22:13.000000000 +0200 @@ -12,6 +12,7 @@ Error, QuoteData, Result, }; use actix_web::{web, HttpRequest, HttpResponse, Responder}; +use base64::{engine::general_purpose, Engine as _}; use log::*; use serde::{Deserialize, Serialize}; use serde_json::json; @@ -137,7 +138,8 @@ debug!("Received ukey"); // get key and decode it from web data - let encrypted_key = match base64::decode(&body.encrypted_key) + let encrypted_key = match general_purpose::STANDARD + .decode(&body.encrypted_key) .map_err(Error::from) { Ok(k) => k, @@ -207,7 +209,10 @@ }; let payload = match &body.payload { - Some(data) => match base64::decode(data).map_err(Error::from) { + Some(data) => match general_purpose::STANDARD + .decode(data) + .map_err(Error::from) + { Ok(d) => Some(d.into()), Err(e) => { warn!("POST u_key returning 400 response. Invalid base64 encoding in payload: {e}"); @@ -247,7 +252,8 @@ debug!("Received vkey"); // get key and decode it from web data - let encrypted_key = match base64::decode(&body.encrypted_key) + let encrypted_key = match general_purpose::STANDARD + .decode(&body.encrypted_key) .map_err(Error::from) { Ok(k) => k, @@ -616,12 +622,14 @@ let enc_u = KeylimeUKey { auth_tag: encoded_auth_tag, - encrypted_key: base64::encode(encrypted_u), - payload: ukey.payload.map(|p| base64::encode(p.as_ref())), + encrypted_key: general_purpose::STANDARD.encode(encrypted_u), + payload: ukey + .payload + .map(|p| general_purpose::STANDARD.encode(p.as_ref())), }; let enc_v = KeylimeVKey { - encrypted_key: base64::encode(encrypted_v), + encrypted_key: general_purpose::STANDARD.encode(encrypted_v), }; (enc_u, enc_v, k) @@ -865,9 +873,9 @@ rsa_oaep_encrypt("edata.pub_key, u.as_ref()).unwrap(); //#[allow_ci] let ukey = KeylimeUKey { - encrypted_key: base64::encode(&encrypted_key), + encrypted_key: general_purpose::STANDARD.encode(&encrypted_key), auth_tag: hex::encode(auth_tag), - payload: payload.map(base64::encode), + payload: payload.map(|p| general_purpose::STANDARD.encode(p)), }; let req = test::TestRequest::post() @@ -882,7 +890,7 @@ rsa_oaep_encrypt("edata.pub_key, v.as_ref()).unwrap(); //#[allow_ci] let vkey = KeylimeVKey { - encrypted_key: base64::encode(&encrypted_key), + encrypted_key: general_purpose::STANDARD.encode(&encrypted_key), }; let req = test::TestRequest::post() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-agent/src/main.rs new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-agent/src/main.rs --- old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-agent/src/main.rs 2023-04-14 09:35:15.000000000 +0200 +++ new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-agent/src/main.rs 2023-04-27 11:22:13.000000000 +0200 @@ -49,6 +49,7 @@ mod version_handler; use actix_web::{dev::Service, http, middleware, rt, web, App, HttpServer}; +use base64::{engine::general_purpose, Engine as _}; use clap::{Arg, Command as ClapApp}; use common::*; use error::{Error, Result}; @@ -520,7 +521,7 @@ if config.agent.ek_handle.is_empty() { ctx.as_mut().flush_context(ek_result.key_handle.into())?; } - let mackey = base64::encode(key.value()); + let mackey = general_purpose::STANDARD.encode(key.value()); let auth_tag = crypto::compute_hmac(mackey.as_bytes(), agent_uuid.as_bytes())?; let auth_tag = hex::encode(&auth_tag); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-agent/src/quotes_handler.rs new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-agent/src/quotes_handler.rs --- old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-agent/src/quotes_handler.rs 2023-04-14 09:35:15.000000000 +0200 +++ new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-agent/src/quotes_handler.rs 2023-04-27 11:22:13.000000000 +0200 @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 // Copyright 2021 Keylime Authors -use crate::{tpm, Error as KeylimeError, QuoteData}; - use crate::common::JsonWrapper; use crate::crypto; use crate::serialization::serialize_maybe_base64; +use crate::{tpm, Error as KeylimeError, QuoteData}; use actix_web::{web, HttpRequest, HttpResponse, Responder}; +use base64::{engine::general_purpose, Engine as _}; use log::*; use serde::{Deserialize, Serialize}; use std::{ @@ -277,7 +277,7 @@ ); } mb_measurement_list = match f.read_to_end(&mut ml) { - Ok(_) => Some(base64::encode(ml)), + Ok(_) => Some(general_purpose::STANDARD.encode(ml)), Err(e) => { warn!("Could not read TPM2 event log: {}", e); None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-agent/src/serialization.rs new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-agent/src/serialization.rs --- old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-agent/src/serialization.rs 2023-04-14 09:35:15.000000000 +0200 +++ new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-agent/src/serialization.rs 2023-04-27 11:22:13.000000000 +0200 @@ -1,6 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 // Copyright 2021 Keylime Authors +use base64::{engine::general_purpose, Engine as _}; use serde::{Deserialize, Serialize}; use serde_json::Number; @@ -16,7 +17,7 @@ where S: serde::Serializer, { - serializer.serialize_str(&base64::encode(bytes)) + serializer.serialize_str(&general_purpose::STANDARD.encode(bytes)) } pub(crate) fn deserialize_as_base64<'de, D>( @@ -26,7 +27,9 @@ D: serde::Deserializer<'de>, { String::deserialize(deserializer).and_then(|string| { - base64::decode(string).map_err(serde::de::Error::custom) + general_purpose::STANDARD + .decode(string) + .map_err(serde::de::Error::custom) }) } @@ -38,7 +41,9 @@ S: serde::Serializer, { match *value { - Some(ref value) => serializer.serialize_str(&base64::encode(value)), + Some(ref value) => { + serializer.serialize_str(&general_purpose::STANDARD.encode(value)) + } None => serializer.serialize_none(), } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-ima-emulator/Cargo.toml new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-ima-emulator/Cargo.toml --- old/rust-keylime-0.2.0+git.1681457715.54484b7/keylime-ima-emulator/Cargo.toml 2023-04-14 09:35:15.000000000 +0200 +++ new/rust-keylime-0.2.1+git.1682587333.b497f1d/keylime-ima-emulator/Cargo.toml 2023-04-27 11:22:13.000000000 +0200 @@ -1,6 +1,6 @@ [package] name = "keylime_ima_emulator" -version = "0.2.0" +version = "0.2.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust-keylime-0.2.0+git.1681457715.54484b7/rpm/centos/keylime-agent-rust.spec new/rust-keylime-0.2.1+git.1682587333.b497f1d/rpm/centos/keylime-agent-rust.spec --- old/rust-keylime-0.2.0+git.1681457715.54484b7/rpm/centos/keylime-agent-rust.spec 2023-04-14 09:35:15.000000000 +0200 +++ new/rust-keylime-0.2.1+git.1682587333.b497f1d/rpm/centos/keylime-agent-rust.spec 2023-04-27 11:22:13.000000000 +0200 @@ -9,7 +9,7 @@ %global __brp_mangle_shebangs_exclude_from ^/usr/src/debug/.*$ Name: keylime-agent-rust -Version: 0.2.0 +Version: 0.2.1 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Summary: Rust agent for Keylime diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust-keylime-0.2.0+git.1681457715.54484b7/rpm/fedora/keylime-agent-rust.spec new/rust-keylime-0.2.1+git.1682587333.b497f1d/rpm/fedora/keylime-agent-rust.spec --- old/rust-keylime-0.2.0+git.1681457715.54484b7/rpm/fedora/keylime-agent-rust.spec 2023-04-14 09:35:15.000000000 +0200 +++ new/rust-keylime-0.2.1+git.1682587333.b497f1d/rpm/fedora/keylime-agent-rust.spec 2023-04-27 11:22:13.000000000 +0200 @@ -4,18 +4,17 @@ %global crate keylime_agent -%if 0%{?fedora} < 38 -# For older Fedora versions, use vendored dependencies due to broken packages +# On Fedora-38 and current Rawhide, it is not possible to build due to missing +# dependency base64 version 0.13 (required by rust-tss-esapi) +# Also due to https://github.com/tpm2-software/tpm2-tools/issues/3210, +# tpm2-tools is currently broken. +# Use vendored dependencies for all Fedora versions. %global bundled_rust_deps 1 -%else -# Otherwise, use only system Rust libraries -%global bundled_rust_deps 0 -%endif %global __brp_mangle_shebangs_exclude_from ^/usr/src/debug/.*$ Name: keylime-agent-rust -Version: 0.2.0 +Version: 0.2.1 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Summary: Rust agent for Keylime diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust-keylime-0.2.0+git.1681457715.54484b7/rpm/fedora/rust-keylime-metadata.patch new/rust-keylime-0.2.1+git.1682587333.b497f1d/rpm/fedora/rust-keylime-metadata.patch --- old/rust-keylime-0.2.0+git.1681457715.54484b7/rpm/fedora/rust-keylime-metadata.patch 2023-04-14 09:35:15.000000000 +0200 +++ new/rust-keylime-0.2.1+git.1682587333.b497f1d/rpm/fedora/rust-keylime-metadata.patch 2023-04-27 11:22:13.000000000 +0200 @@ -1,16 +1,7 @@ diff --git a/keylime-agent/Cargo.toml b/keylime-agent/Cargo.toml -index 2d9cd9a..e4a7852 100644 +index 0cc1385..286e807 100644 --- a/keylime-agent/Cargo.toml +++ b/keylime-agent/Cargo.toml -@@ -13,7 +13,7 @@ base64 = "0.13" - cfg-if = "1" - clap = { version = "3.2", features = ["derive"] } - compress-tools = "0.12" --config = { version = "0.13", features = ["toml"] } -+config = { version = "0.12", features = ["toml"] } - futures = "0.3.6" - glob = "0.3" - hex = "0.4" @@ -21,8 +21,8 @@ keylime = { path = "../keylime" } libc = "0.2.43" log = "0.4" @@ -20,7 +11,7 @@ +picky-asn1-der = "0.3" +picky-asn1-x509 = "0.7" pretty_env_logger = "0.4" - reqwest = {version = "0.11", features = ["json"]} + reqwest = {version = "0.11", default-features = false, features = ["json"]} serde = "1.0.80" @@ -31,7 +31,7 @@ serde_json = { version = "1.0", features = ["raw_value"] } static_assertions = "1" @@ -31,11 +22,9 @@ thiserror = "1.0" uuid = {version = "1.3", features = ["v4"]} zmq = {version = "0.9.2", optional = true} -@@ -46,20 +46,7 @@ actix-rt = "2" - [features] - # The features enabled by default +@@ -48,18 +48,6 @@ actix-rt = "2" default = [] --# this should change to dev-dependencies when we have integration testing + # this should change to dev-dependencies when we have integration testing testing = ["wiremock"] -# Whether the agent should be compiled with support to listen for notification -# messages on ZeroMQ ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust-keylime/vendor.tar.xz /work/SRC/openSUSE:Factory/.rust-keylime.new.1533/vendor.tar.xz differ: char 27, line 1
