diff --git a/Cargo.lock b/Cargo.lock index 2fe16685c..11fedc10a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -305,7 +305,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.50", + "syn 2.0.58", "which", ] @@ -317,9 +317,9 @@ checksum = "f59bbe95d4e52a6398ec21238d31577f2b28a9d86807f06ca59d191d8440d0bb" [[package]] name = "bit-vec" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0dc55f2d8a1a85650ac47858bb001b4c0dd73d79e3c455a842925e68d29cd3" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" @@ -497,7 +497,7 @@ dependencies = [ "heck", "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.50", + "syn 2.0.58", ] [[package]] @@ -726,7 +726,7 @@ dependencies = [ [[package]] name = "dcap-artifact-retrieval" -version = "0.4.0" +version = "0.5.0" dependencies = [ "backoff", "clap 2.34.0", @@ -735,11 +735,12 @@ dependencies = [ "mbedtls", "num_enum", "pcs", - "percent-encoding 2.1.0", + "percent-encoding 2.3.1", "pkix", "quick-error", "reqwest", "rustc-serialize", + "rustls-mbedcrypto-provider", "serde", "serde_cbor", "serde_json", @@ -822,6 +823,17 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.58", +] + [[package]] name = "dtoa" version = "0.4.6" @@ -1011,7 +1023,7 @@ dependencies = [ "shiplift", "tempfile", "tokio", - "url 2.2.2", + "url 2.5.4", ] [[package]] @@ -1097,7 +1109,7 @@ dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.81", - "synstructure", + "synstructure 0.12.6", ] [[package]] @@ -1169,12 +1181,11 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ - "matches", - "percent-encoding 2.1.0", + "percent-encoding 2.3.1", ] [[package]] @@ -1260,9 +1271,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.17" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1270,9 +1281,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.17" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" @@ -1287,42 +1298,39 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.17" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.17" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ - "autocfg 1.0.1", - "proc-macro-hack", "proc-macro2 1.0.78", "quote 1.0.35", - "syn 1.0.81", + "syn 2.0.58", ] [[package]] name = "futures-sink" -version = "0.3.17" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.17" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.17" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ - "autocfg 1.0.1", "futures 0.1.30", "futures-channel", "futures-core", @@ -1333,8 +1341,6 @@ dependencies = [ "memchr", "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab", "tokio-io", ] @@ -1656,9 +1662,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.26.0" +version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ "futures-util", "http 1.1.0", @@ -1756,7 +1762,7 @@ dependencies = [ "lazy_static", "log 0.4.21", "mbedtls", - "percent-encoding 2.1.0", + "percent-encoding 2.3.1", "pkix", "report-test", "reqwest", @@ -1769,7 +1775,93 @@ dependencies = [ "sgxs", "sgxs-loaders", "tokio", - "url 2.2.2", + "url 2.5.4", +] + +[[package]] +name = "icu_collections" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +dependencies = [ + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" + +[[package]] +name = "icu_properties" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "potential_utf", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" + +[[package]] +name = "icu_provider" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +dependencies = [ + "displaydoc", + "icu_locale_core", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", ] [[package]] @@ -1791,13 +1883,23 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -1999,6 +2101,12 @@ version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" +[[package]] +name = "litemap" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" + [[package]] name = "lock_api" version = "0.4.6" @@ -2514,7 +2622,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.50", + "syn 2.0.58", ] [[package]] @@ -2564,7 +2672,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.50", + "syn 2.0.58", ] [[package]] @@ -2669,7 +2777,7 @@ dependencies = [ "hex 0.4.3", "mbedtls", "num", - "percent-encoding 2.1.0", + "percent-encoding 2.3.1", "pkix", "quick-error", "reqwest", @@ -2696,9 +2804,9 @@ checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" @@ -2814,7 +2922,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3627d36de10749cd6bba01a975d64c01f1deb95d22823dbfbb4d7a913a240850" dependencies = [ "b64-ct", - "bit-vec 0.6.2", + "bit-vec 0.6.3", "chrono", "lazy_static", "num-bigint 0.2.6", @@ -2831,6 +2939,15 @@ dependencies = [ "typemap", ] +[[package]] +name = "potential_utf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +dependencies = [ + "zerovec", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -2850,7 +2967,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" dependencies = [ "proc-macro2 1.0.78", - "syn 2.0.50", + "syn 2.0.58", ] [[package]] @@ -2862,18 +2979,6 @@ dependencies = [ "toml_edit", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" - [[package]] name = "proc-macro2" version = "0.4.30" @@ -2922,7 +3027,7 @@ version = "2.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6653d384a260fedff0a466e894e05c5b8d75e261a14e9f93e81e43ef86cad23" dependencies = [ - "log 0.3.9", + "log 0.4.21", "which", ] @@ -3223,9 +3328,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes 1.7.1", @@ -3247,7 +3352,7 @@ dependencies = [ "mime 0.3.16", "native-tls", "once_cell", - "percent-encoding 2.1.0", + "percent-encoding 2.3.1", "pin-project-lite", "rustls", "rustls-pemfile", @@ -3261,12 +3366,11 @@ dependencies = [ "tokio-native-tls", "tokio-rustls", "tower-service", - "url 2.2.2", + "url 2.5.4", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", - "winreg", + "windows-registry", ] [[package]] @@ -3344,18 +3448,43 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321" dependencies = [ "log 0.4.21", - "ring", + "once_cell", "rustls-pki-types", - "rustls-webpki", + "rustls-webpki 0.103.3", "subtle", "zeroize", ] +[[package]] +name = "rustls-mbedcrypto-provider" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6841ca311a5a41f618eb7095aaa2d3ab8810a540c9e57ce6ce63b0e0431070bc" +dependencies = [ + "bit-vec 0.6.3", + "log 0.4.21", + "mbedtls", + "rustls", + "rustls-mbedtls-provider-utils", + "rustls-webpki 0.102.8", + "yasna 0.3.2", +] + +[[package]] +name = "rustls-mbedtls-provider-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec33e15661de795beee762ce87767de05aa01c7ca69dbd8275ae84e9ecab81dc" +dependencies = [ + "mbedtls", + "rustls", +] + [[package]] name = "rustls-pemfile" version = "2.1.3" @@ -3368,9 +3497,12 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +dependencies = [ + "zeroize", +] [[package]] name = "rustls-webpki" @@ -3383,6 +3515,17 @@ dependencies = [ "untrusted", ] +[[package]] +name = "rustls-webpki" +version = "0.103.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.3" @@ -3521,7 +3664,7 @@ source = "git+https://github.com/fortanix/serde.git?branch=master#1755f934942d36 dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.50", + "syn 2.0.58", ] [[package]] @@ -3758,7 +3901,7 @@ dependencies = [ "serde_json", "tar", "tokio", - "url 2.2.2", + "url 2.5.4", ] [[package]] @@ -3830,6 +3973,12 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -3884,9 +4033,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.50" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", @@ -3895,9 +4044,12 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -3911,22 +4063,33 @@ dependencies = [ "unicode-xid 0.2.1", ] +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.58", +] + [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.2.1", + "bitflags 2.5.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -4002,7 +4165,7 @@ checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.50", + "syn 2.0.58", ] [[package]] @@ -4049,6 +4212,16 @@ dependencies = [ "time-core", ] +[[package]] +name = "tinystr" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" version = "0.3.4" @@ -4093,7 +4266,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.50", + "syn 2.0.58", ] [[package]] @@ -4120,12 +4293,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" dependencies = [ "rustls", - "rustls-pki-types", "tokio", ] @@ -4232,7 +4404,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.50", + "syn 2.0.58", ] [[package]] @@ -4365,16 +4537,21 @@ dependencies = [ [[package]] name = "url" -version = "2.2.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", - "idna 0.2.0", - "matches", - "percent-encoding 2.1.0", + "idna 1.0.3", + "percent-encoding 2.3.1", ] +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -4500,26 +4677,27 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.80" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if 1.0.0", + "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.80" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", - "lazy_static", "log 0.4.21", "proc-macro2 1.0.78", "quote 1.0.35", - "syn 1.0.81", + "syn 2.0.58", "wasm-bindgen-shared", ] @@ -4537,9 +4715,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.80" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote 1.0.35", "wasm-bindgen-macro-support", @@ -4547,22 +4725,25 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.80" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", - "syn 1.0.81", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.80" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" @@ -4574,15 +4755,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.26.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "which" version = "4.4.2" @@ -4641,6 +4813,36 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -4790,14 +4992,10 @@ dependencies = [ ] [[package]] -name = "winreg" -version = "0.52.0" +name = "writeable" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", -] +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" [[package]] name = "xattr" @@ -4848,7 +5046,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0de7bff972b4f2a06c85f6d8454b09df153af7e3a4ec2aac81db1b105b684ddb" dependencies = [ - "bit-vec 0.6.2", + "bit-vec 0.6.3", "num-bigint 0.2.6", ] @@ -4861,14 +5059,92 @@ dependencies = [ "num-bigint 0.4.3", ] +[[package]] +name = "yoke" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.58", + "synstructure 0.13.2", +] + [[package]] name = "zero" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f1bc8a6b2005884962297587045002d8cfb8dcec9db332f4ca216ddc5de82c5" +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.58", + "synstructure 0.13.2", +] + [[package]] name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerotrie" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.58", +] diff --git a/intel-sgx/dcap-artifact-retrieval/Cargo.toml b/intel-sgx/dcap-artifact-retrieval/Cargo.toml index 16cda557f..6c54be0d6 100644 --- a/intel-sgx/dcap-artifact-retrieval/Cargo.toml +++ b/intel-sgx/dcap-artifact-retrieval/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dcap-artifact-retrieval" -version = "0.4.0" +version = "0.5.0" authors = ["Fortanix, Inc."] license = "MPL-2.0" edition = "2018" @@ -37,10 +37,11 @@ reqwest = { version = "0.12", features = ["blocking", "native-tls"], optional = serde_cbor = "0.11" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" +rustls-mbedcrypto-provider = { version = "0.1", features = ["logging"], optional = true } [features] default = ["clap", "reqwest"] -rustls-tls = ["reqwest?/rustls-tls"] +rustls-tls = ["reqwest?/rustls-tls-no-provider", "rustls-mbedcrypto-provider"] [dev-dependencies] yasna = { version = "0.3", features = ["num-bigint", "bit-vec"] } diff --git a/intel-sgx/dcap-artifact-retrieval/src/main.rs b/intel-sgx/dcap-artifact-retrieval/src/main.rs index 3d21c15c5..2cf9e2ba2 100644 --- a/intel-sgx/dcap-artifact-retrieval/src/main.rs +++ b/intel-sgx/dcap-artifact-retrieval/src/main.rs @@ -7,5 +7,9 @@ #[cfg(all(not(target_env = "sgx"), feature = "reqwest"))] fn main() { + #[cfg(feature = "rustls-tls")] + rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default() + .expect("install rustls mbedtls crypto provider"); dcap_artifact_retrieval::cli::main() } diff --git a/intel-sgx/dcap-artifact-retrieval/src/provisioning_client/azure.rs b/intel-sgx/dcap-artifact-retrieval/src/provisioning_client/azure.rs index 330a1e2d2..0a59ee98c 100644 --- a/intel-sgx/dcap-artifact-retrieval/src/provisioning_client/azure.rs +++ b/intel-sgx/dcap-artifact-retrieval/src/provisioning_client/azure.rs @@ -207,6 +207,9 @@ mod tests { #[test] pub fn pcks_azure() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); let client = AzureProvisioningClientBuilder::new(PcsVersion::V3) .set_retry_timeout(TIME_RETRY_TIMEOUT) .build(reqwest_client()); @@ -245,6 +248,9 @@ mod tests { #[test] pub fn pck_crl() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); let client = AzureProvisioningClientBuilder::new(PcsVersion::V3) .set_retry_timeout(TIME_RETRY_TIMEOUT) .build(reqwest_client()); @@ -254,6 +260,9 @@ mod tests { #[test] pub fn qe_identity() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); let client = AzureProvisioningClientBuilder::new(PcsVersion::V3) .set_retry_timeout(TIME_RETRY_TIMEOUT) .build(reqwest_client()); @@ -262,6 +271,9 @@ mod tests { #[test] pub fn test_pckcerts_with_fallback() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); let client = AzureProvisioningClientBuilder::new(PcsVersion::V3) .set_retry_timeout(TIME_RETRY_TIMEOUT) .build(reqwest_client()); @@ -297,6 +309,9 @@ mod tests { #[test] pub fn tcb_evaluation_data_numbers() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); let client = AzureProvisioningClientBuilder::new(PcsVersion::V3) .set_retry_timeout(TIME_RETRY_TIMEOUT) .build(reqwest_client()); diff --git a/intel-sgx/dcap-artifact-retrieval/src/provisioning_client/intel.rs b/intel-sgx/dcap-artifact-retrieval/src/provisioning_client/intel.rs index e65d3a325..3fdabfeaf 100644 --- a/intel-sgx/dcap-artifact-retrieval/src/provisioning_client/intel.rs +++ b/intel-sgx/dcap-artifact-retrieval/src/provisioning_client/intel.rs @@ -593,6 +593,9 @@ mod tests { #[test] pub fn pcks() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for api_version in [PcsVersion::V3, PcsVersion::V4] { let mut intel_builder = IntelProvisioningClientBuilder::new(api_version) .set_retry_timeout(TIME_RETRY_TIMEOUT); @@ -620,6 +623,9 @@ mod tests { #[test] pub fn pcks_cached() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for api_version in [PcsVersion::V3, PcsVersion::V4] { let mut intel_builder = IntelProvisioningClientBuilder::new(api_version) .set_retry_timeout(TIME_RETRY_TIMEOUT); @@ -673,6 +679,9 @@ mod tests { #[test] pub fn pck() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for api_version in [PcsVersion::V3, PcsVersion::V4] { let mut intel_builder = IntelProvisioningClientBuilder::new(api_version) .set_retry_timeout(TIME_RETRY_TIMEOUT); @@ -703,6 +712,9 @@ mod tests { #[test] pub fn pck_cached() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for api_version in [PcsVersion::V3, PcsVersion::V4] { let root_ca = include_bytes!("../../tests/data/root_SGX_CA_der.cert"); let root_cas = [&root_ca[..]]; @@ -793,6 +805,9 @@ mod tests { #[test] pub fn tcb_info() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for api_version in [PcsVersion::V3, PcsVersion::V4] { let mut intel_builder = IntelProvisioningClientBuilder::new(api_version) .set_retry_timeout(TIME_RETRY_TIMEOUT); @@ -817,6 +832,9 @@ mod tests { #[test] pub fn tcb_info_with_evaluation_data_number() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); let intel_builder = IntelProvisioningClientBuilder::new(PcsVersion::V4) .set_retry_timeout(TIME_RETRY_TIMEOUT); let client = intel_builder.build(reqwest_client()); @@ -842,6 +860,9 @@ mod tests { #[test] pub fn tcb_info_cached() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for api_version in [PcsVersion::V3, PcsVersion::V4] { let mut intel_builder = IntelProvisioningClientBuilder::new(api_version) .set_retry_timeout(TIME_RETRY_TIMEOUT); @@ -889,6 +910,9 @@ mod tests { #[test] pub fn pckcrl() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for ca in [DcapArtifactIssuer::PCKProcessorCA, DcapArtifactIssuer::PCKPlatformCA] { for api_version in [PcsVersion::V3, PcsVersion::V4] { let mut intel_builder = IntelProvisioningClientBuilder::new(api_version) @@ -907,6 +931,9 @@ mod tests { #[test] pub fn pckcrl_cached() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for ca in [DcapArtifactIssuer::PCKProcessorCA, DcapArtifactIssuer::PCKPlatformCA] { for api_version in [PcsVersion::V3, PcsVersion::V4] { let mut intel_builder = IntelProvisioningClientBuilder::new(api_version) @@ -947,6 +974,9 @@ mod tests { #[test] pub fn qe_identity() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for api_version in [PcsVersion::V3, PcsVersion::V4] { let mut intel_builder = IntelProvisioningClientBuilder::new(api_version) .set_retry_timeout(TIME_RETRY_TIMEOUT); @@ -962,6 +992,9 @@ mod tests { #[test] pub fn qe_identity_cached() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for api_version in [PcsVersion::V3, PcsVersion::V4] { let mut intel_builder = IntelProvisioningClientBuilder::new(api_version) .set_retry_timeout(TIME_RETRY_TIMEOUT); @@ -1000,6 +1033,9 @@ mod tests { #[test] pub fn tcb_evaluation_data_numbers() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); let root_ca = include_bytes!("../../tests/data/root_SGX_CA_der.cert"); let root_cas = [&root_ca[..]]; let intel_builder = IntelProvisioningClientBuilder::new(PcsVersion::V4) diff --git a/intel-sgx/dcap-artifact-retrieval/src/provisioning_client/pccs.rs b/intel-sgx/dcap-artifact-retrieval/src/provisioning_client/pccs.rs index db89dc16a..e115e4411 100644 --- a/intel-sgx/dcap-artifact-retrieval/src/provisioning_client/pccs.rs +++ b/intel-sgx/dcap-artifact-retrieval/src/provisioning_client/pccs.rs @@ -462,6 +462,9 @@ mod tests { #[test] pub fn pck() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for api_version in [PcsVersion::V3, PcsVersion::V4] { let client = make_client(api_version); @@ -489,6 +492,9 @@ mod tests { #[test] pub fn pck_cached() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); let root_ca = include_bytes!("../../tests/data/root_SGX_CA_der.cert"); let root_cas = [&root_ca[..]]; for api_version in [PcsVersion::V3, PcsVersion::V4] { @@ -572,6 +578,9 @@ mod tests { #[test] pub fn test_pckcerts_with_fallback() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for api_version in [PcsVersion::V3, PcsVersion::V4] { let client = make_client(api_version); @@ -607,6 +616,9 @@ mod tests { #[test] pub fn tcb_info() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for api_version in [PcsVersion::V3, PcsVersion::V4] { let client = make_client(api_version); @@ -626,6 +638,9 @@ mod tests { #[test] pub fn tcb_info_with_evaluation_data_number() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); let client = make_client(PcsVersion::V4); for pckid in PckID::parse_file(&PathBuf::from(PCKID_TEST_FILE).as_path()) .unwrap() @@ -651,6 +666,9 @@ mod tests { #[test] pub fn tcb_info_cached() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for api_version in [PcsVersion::V3, PcsVersion::V4] { let client = make_client(api_version); @@ -692,6 +710,9 @@ mod tests { #[test] pub fn pckcrl() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for api_version in [PcsVersion::V3, PcsVersion::V4] { let client = make_client(api_version); assert!(client @@ -707,6 +728,9 @@ mod tests { #[test] pub fn pckcrl_cached() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for ca in [DcapArtifactIssuer::PCKProcessorCA, DcapArtifactIssuer::PCKPlatformCA] { for api_version in [PcsVersion::V3, PcsVersion::V4] { let client = make_client(api_version); @@ -742,6 +766,9 @@ mod tests { #[test] pub fn qe_identity() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for api_version in [PcsVersion::V3, PcsVersion::V4] { let client = make_client(api_version); let qe_id = client.qe_identity(None); @@ -752,6 +779,9 @@ mod tests { #[test] pub fn qe_identity_cached() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); for api_version in [PcsVersion::V3, PcsVersion::V4] { let client = make_client(api_version); let qe_id = client.qe_identity(None).unwrap(); @@ -785,6 +815,9 @@ mod tests { #[test] pub fn tcb_evaluation_data_numbers() { + #[cfg(feature = "rustls-tls")] + let _ = rustls_mbedcrypto_provider::mbedtls_crypto_provider() + .install_default(); let root_ca = include_bytes!("../../tests/data/root_SGX_CA_der.cert"); let root_cas = [&root_ca[..]]; let client = make_client(PcsVersion::V4);