diff --git a/Cargo.lock b/Cargo.lock index 3d678d031a2..00411e690a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -51,9 +51,9 @@ checksum = "ec8ad6edb4840b78c5c3d88de606b22252d552b55f3a4699fbb10fc070ec3049" [[package]] name = "anyhow" -version = "1.0.53" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" +checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" [[package]] name = "anymap2" @@ -67,6 +67,45 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08abcc3b4e9339e33a3d0a5ed15d84a687350c05689d825e0f6655eef9e76a94" +[[package]] +name = "asn1-rs" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits 0.2.14", + "rusticata-macros", + "thiserror", + "time 0.3.9", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "assert_matches" version = "1.5.0" @@ -86,9 +125,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171374e7e3b2504e0e5236e3b59260560f9fe94bfe9ac39ba5e4e929c5590625" +checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" dependencies = [ "async-stream-impl", "futures-core", @@ -96,9 +135,9 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308" +checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ "proc-macro2", "quote", @@ -107,9 +146,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.52" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" dependencies = [ "proc-macro2", "quote", @@ -133,6 +172,49 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "axum" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47594e438a243791dba58124b6669561f5baa14cb12046641d8008bf035e5a25" +dependencies = [ + "async-trait", + "axum-core", + "bitflags", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "itoa 1.0.1", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "serde", + "sync_wrapper", + "tokio", + "tower", + "tower-http", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a671c9ae99531afdd5d3ee8340b8da547779430689947144c140fc74a740244" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", +] + [[package]] name = "backtrace" version = "0.3.64" @@ -162,9 +244,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "base64ct" -version = "1.3.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874f8444adcb4952a8bc51305c8be95c8ec8237bb0d2e78d2e039f771f8828a0" +checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179" [[package]] name = "bencher" @@ -177,8 +259,8 @@ name = "benchmark" version = "0.1.0" dependencies = [ "oak_functions", - "prost", - "prost-build", + "prost 0.10.0", + "prost-build 0.10.0", ] [[package]] @@ -294,9 +376,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.7.3" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439989e6b8c38d1b6570a384ef1e49c8848128f5a97f3914baef02920842712f" +checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc" [[package]] name = "byteorder" @@ -396,9 +478,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba2ae6de944143141f6155a473a6b02f66c7c3f9f47316f802f80204ebfe6e12" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", @@ -418,9 +500,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.72" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" dependencies = [ "jobserver", ] @@ -451,7 +533,7 @@ dependencies = [ "libc", "num-integer", "num-traits 0.2.14", - "time", + "time 0.1.43", "winapi", ] @@ -468,9 +550,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.0.14" +version = "3.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63edc3f163b3c71ec8aa23f9bd6070f77edbf3d1d198b164afa90ff00e4ec62" +checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c" dependencies = [ "atty", "bitflags", @@ -480,23 +562,23 @@ dependencies = [ "os_str_bytes", "strsim", "termcolor", - "textwrap 0.14.2", + "textwrap 0.15.0", ] [[package]] name = "clap_complete" -version = "3.0.6" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678db4c39c013cc68b54d372bce2efc58e30a0337c497c9032fd196802df3bc3" +checksum = "df6f3613c0a3cddfd78b41b10203eb322cb29b600cbdf808a7d3db95691b8e25" dependencies = [ - "clap 3.0.14", + "clap 3.1.8", ] [[package]] name = "clap_derive" -version = "3.0.14" +version = "3.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1132dc3944b31c20dd8b906b3a9f0a5d0243e092d59171414969657ac6aa85" +checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -514,6 +596,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "cmake" +version = "0.1.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +dependencies = [ + "cc", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -564,27 +655,27 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" dependencies = [ "libc", ] [[package]] name = "cranelift-bforest" -version = "0.81.1" +version = "0.81.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f027f29ace03752bb83c112eb4f53744bc4baadf19955e67fcde1d71d2f39d" +checksum = "0eba0f73ab0da95f5d3bd5161da14edc586a88aeae1d09e4a0924f7a141a0093" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.81.1" +version = "0.81.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c10af69cbf4e228c11bdc26d8f9d5276773909152a769649a160571b282f92f" +checksum = "e9cff8758662518d743460f32c3ca6f32d726070af612c19ba92d01ea727e6d9" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", @@ -599,33 +690,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.81.1" +version = "0.81.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290ac14d2cef43cbf1b53ad5c1b34216c9e32e00fa9b6ac57b5e5a2064369e02" +checksum = "bfc82fef9d470dd617c4d2537d8f4146d82526bb3bc3ef35b599a3978dad8c81" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.81.1" +version = "0.81.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb9142d134a03d01e3995e6d8dd3aecf16312261d0cb0c5dcd73d5be2528c1c" +checksum = "a06f531b6173eb2fd92d9a9b2a0dbb2450079f913040bdc323ec43ec752b7e44" [[package]] name = "cranelift-entity" -version = "0.81.1" +version = "0.81.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1268a50b7cbbfee8514d417fc031cedd9965b15fa9e5ed1d4bc16de86f76765e" +checksum = "d84f8e8a408071d67f479a00c6d3da965b1f9b4b240b7e7e27edb1a34401b3cd" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.81.1" +version = "0.81.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ac0d440469e19ab12183e31a9e41b4efd8a4ca5fbde2a10c78c7bb857cc2a4" +checksum = "72cc22592c10f1fa6664a55e34ec52593125a94176856d3ec2f7af5664374da1" dependencies = [ "cranelift-codegen", "log", @@ -635,9 +726,9 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.81.1" +version = "0.81.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794cd1a5694a01c68957f9cfdc5ac092cf8b4e9c2d1697c4a5100f90103e9e9e" +checksum = "c3da723ebbee69f348feb49acc9f6f5b7ad668c04a145abbc7a75b669f9b0afd" dependencies = [ "cranelift-codegen", "libc", @@ -646,9 +737,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.81.1" +version = "0.81.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ddd4ca6963f6e94d00e8935986411953581ac893587ab1f0eb4f0b5a40ae65" +checksum = "642c30e1600295e9c58fc349376187831dce1df6822ece7e8ab880010d6e4be2" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -707,9 +798,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" +checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" dependencies = [ "cfg-if", "crossbeam-utils", @@ -728,10 +819,11 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9" +checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" dependencies = [ + "autocfg", "cfg-if", "crossbeam-utils", "lazy_static", @@ -741,9 +833,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6" +checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ "cfg-if", "lazy_static", @@ -763,11 +855,12 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4600d695eb3f6ce1cd44e6e291adceb2cc3ab12f20a33777ecd0bf6eba34e06" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" dependencies = [ "generic-array 0.14.5", + "typenum", ] [[package]] @@ -827,24 +920,14 @@ dependencies = [ "pem-rfc7468", ] -[[package]] -name = "der-oid-macro" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c73af209b6a5dc8ca7cbaba720732304792cddc933cfea3d74509c2b1ef2f436" -dependencies = [ - "num-bigint 0.4.3", - "num-traits 0.2.14", - "syn", -] - [[package]] name = "der-parser" -version = "6.0.1" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cddf120f700b411b2b02ebeb7f04dc0b7c8835909a6c2f52bf72ed0dd3433b2" +checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" dependencies = [ - "der-oid-macro", + "asn1-rs", + "displaydoc", "nom", "num-bigint 0.4.3", "num-traits 0.2.14", @@ -882,9 +965,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb780dce4f9a8f5c087362b3a4595936b2019e7c8b30f2c3e9a7e94e6ae9837" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ "block-buffer 0.10.2", "crypto-common", @@ -921,6 +1004,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "doc-comment" version = "0.3.3" @@ -935,9 +1029,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dyn-clone" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" +checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28" [[package]] name = "ecdsa" @@ -961,9 +1055,9 @@ dependencies = [ [[package]] name = "educe" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b50932a01e7ec5c06160492ab660fb19b6bb2a7878030dd6cd68d21df9d4d" +checksum = "c07b7cc9cd8c08d10db74fca3b20949b9b6199725c04a0cce6d543496098fcac" dependencies = [ "enum-ordinalize", "proc-macro2", @@ -998,14 +1092,15 @@ dependencies = [ [[package]] name = "enum-ordinalize" -version = "3.1.10" +version = "3.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b166c9e378360dd5a6666a9604bb4f54ae0cac39023ffbac425e917a2a04fef" +checksum = "2170fc0efee383079a8bdd05d6ea2a184d2a0f07a1c1dcabdb2fd5e9f24bc36c" dependencies = [ "num-bigint 0.4.3", "num-traits 0.2.14", "proc-macro2", "quote", + "rustc_version", "syn", ] @@ -1142,9 +1237,9 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.11" +version = "0.10.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b279436a715a9de95dcd26b151db590a71961cc06e54918b24fe0dd5b7d3fc4" +checksum = "843c03199d0c0ca54bc1ea90ac0d507274c28abcc4f691ae8b4eaa375087c76a" dependencies = [ "futures-core", "futures-sink", @@ -1301,8 +1396,8 @@ dependencies = [ "oak_functions_loader", "oak_functions_lookup", "oak_functions_metrics", - "prost", - "prost-build", + "prost 0.10.0", + "prost-build 0.10.0", "rand 0.8.5", "test_utils", "tokio", @@ -1329,14 +1424,14 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" +checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi", + "wasi 0.10.2+wasi-snapshot-preview1", "wasm-bindgen", ] @@ -1381,8 +1476,8 @@ dependencies = [ "oak_functions_abi", "oak_remote_attestation", "oak_utils", - "prost", - "prost-types", + "prost 0.10.0", + "prost-types 0.10.0", "rand 0.8.5", "serde", "tokio", @@ -1392,9 +1487,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.11" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f1f717ddc7b2ba36df7e871fd88db79326551d3d6f1fc406fbfd28b582ff8e" +checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" dependencies = [ "bytes", "fnv", @@ -1489,6 +1584,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + [[package]] name = "httparse" version = "1.6.0" @@ -1509,9 +1610,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "humantime-serde" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac34a56cfd4acddb469cc7fff187ed5ac36f498ba085caf8bbc725e3ff474058" +checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" dependencies = [ "humantime", "serde", @@ -1519,9 +1620,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.17" +version = "0.14.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd" +checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" dependencies = [ "bytes", "futures-channel", @@ -1550,10 +1651,10 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.20.3", - "rustls-native-certs 0.6.1", + "rustls 0.20.4", + "rustls-native-certs", "tokio", - "tokio-rustls 0.23.2", + "tokio-rustls 0.23.3", ] [[package]] @@ -1581,16 +1682,16 @@ dependencies = [ [[package]] name = "image" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94ac3d41f882c624a82d7945952032388488681f45f9d4077999a6c85688d61" +checksum = "db207d030ae38f1eb6f240d5a1c1c88ff422aa005d10f8c6c6fc5e75286ab30e" dependencies = [ "bytemuck", "byteorder", "color_quant", "exr", "gif", - "jpeg-decoder 0.2.2", + "jpeg-decoder 0.2.4", "num-iter", "num-rational 0.4.0", "num-traits 0.2.14", @@ -1601,9 +1702,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" dependencies = [ "autocfg", "hashbrown", @@ -1704,9 +1805,9 @@ checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" [[package]] name = "jpeg-decoder" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105fb082d64e2100074587f59a74231f771750c664af903f1f9f76c9dedfc6f1" +checksum = "744c24117572563a98a7e9168a5ac1ee4a1ca7f702211258797bbe0ed0346c3c" dependencies = [ "rayon", ] @@ -1731,7 +1832,7 @@ dependencies = [ "oak_functions_abi", "oak_functions_loader", "oak_functions_lookup", - "prost", + "prost 0.10.0", "test_utils", "tokio", ] @@ -1765,9 +1866,9 @@ checksum = "7efd1d698db0759e6ef11a7cd44407407399a910c774dd804c64c032da7826ff" [[package]] name = "libc" -version = "0.2.118" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e509672465a0504304aa87f9f176f2b2b716ed8fb105ebe5c02dc6dce96a94" +checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" [[package]] name = "libm" @@ -1801,9 +1902,23 @@ checksum = "26e930310cf4334c4936ae18737500a57739c69442b5c42bae114d619af54b82" dependencies = [ "doc-comment", "kstring", - "liquid-core", - "liquid-derive", - "liquid-lib", + "liquid-core 0.23.2", + "liquid-derive 0.23.1", + "liquid-lib 0.23.1", + "serde", +] + +[[package]] +name = "liquid" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6e6551b4c8a2045351f0853b54807b21080176a055b754dc0ad29428edf293" +dependencies = [ + "doc-comment", + "kstring", + "liquid-core 0.24.1", + "liquid-derive 0.24.0", + "liquid-lib 0.24.0", "serde", ] @@ -1817,13 +1932,30 @@ dependencies = [ "chrono", "itertools", "kstring", - "liquid-derive", + "liquid-derive 0.23.1", "num-traits 0.2.14", "pest", "pest_derive", "serde", ] +[[package]] +name = "liquid-core" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea8f6c13e8ae36bce67fc1eaacf32c13b26d16576b7ee2ec9de33a3980cefd6" +dependencies = [ + "anymap2", + "itertools", + "kstring", + "liquid-derive 0.24.0", + "num-traits 0.2.14", + "pest", + "pest_derive", + "serde", + "time 0.3.9", +] + [[package]] name = "liquid-derive" version = "0.23.1" @@ -1835,6 +1967,17 @@ dependencies = [ "syn", ] +[[package]] +name = "liquid-derive" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82d81028aba7e869d0aa423ae926a7f15fd55ca576baac279ed38020b180a56" +dependencies = [ + "proc-macro2", + "proc-quote", + "syn", +] + [[package]] name = "liquid-lib" version = "0.23.1" @@ -1844,10 +1987,26 @@ dependencies = [ "chrono", "itertools", "kstring", - "liquid-core", + "liquid-core 0.23.2", + "once_cell", + "percent-encoding", + "regex", + "unicode-segmentation", +] + +[[package]] +name = "liquid-lib" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8256326835eae262affdc6df8743d9e1b917354ba3c8c380e6238426a8097564" +dependencies = [ + "itertools", + "kstring", + "liquid-core 0.24.1", "once_cell", "percent-encoding", "regex", + "time 0.3.9", "unicode-segmentation", ] @@ -1861,18 +2020,19 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" dependencies = [ "cfg-if", ] @@ -1883,12 +2043,12 @@ version = "0.1.0" dependencies = [ "anyhow", "bytes", - "clap 3.0.14", + "clap 3.1.8", "env_logger 0.9.0", "location_utils", "log", "oak_functions_abi", - "prost", + "prost 0.10.0", "serde", ] @@ -1898,11 +2058,11 @@ version = "0.1.0" dependencies = [ "anyhow", "bytes", - "clap 3.0.14", + "clap 3.1.8", "location_utils", "multimap", "oak_functions_abi", - "prost", + "prost 0.10.0", "rand 0.8.5", "serde", "serde_json", @@ -1910,9 +2070,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb87f3080f6d1d69e8c564c0fcfde1d7aa8cc451ce40cae89479111f03bc0eb" +checksum = "32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889" dependencies = [ "hashbrown", ] @@ -1948,6 +2108,12 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +[[package]] +name = "matchit" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" + [[package]] name = "matrixmultiply" version = "0.3.2" @@ -1996,13 +2162,19 @@ name = "metrics_client" version = "0.1.0" dependencies = [ "anyhow", - "clap 3.0.14", + "clap 3.1.8", "oak_functions_abi", "oak_functions_client", "tokio", "tonic", ] +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2030,14 +2202,15 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" dependencies = [ "libc", "log", "miow", "ntapi", + "wasi 0.11.0+wasi-snapshot-preview1", "winapi", ] @@ -2057,7 +2230,7 @@ dependencies = [ "anyhow", "oak_functions", "oak_functions_abi", - "prost", + "prost 0.10.0", ] [[package]] @@ -2069,9 +2242,9 @@ dependencies = [ "image", "oak_functions_abi", "oak_functions_client", - "prost", + "prost 0.10.0", "tokio", - "tract-tensorflow 0.15.8", + "tract-tensorflow 0.16.3", ] [[package]] @@ -2091,9 +2264,9 @@ dependencies = [ [[package]] name = "nanorand" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729eb334247daa1803e0a094d0a5c55711b85571179f5ec6e53eccfdf7008958" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ "getrandom", ] @@ -2126,13 +2299,12 @@ dependencies = [ [[package]] name = "nom" -version = "7.1.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" dependencies = [ "memchr", "minimal-lexical", - "version_check", ] [[package]] @@ -2246,6 +2418,15 @@ dependencies = [ "libc", ] +[[package]] +name = "num_threads" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0" +dependencies = [ + "libc", +] + [[package]] name = "oak_attestation_common" version = "0.1.0" @@ -2258,7 +2439,7 @@ dependencies = [ "rustls 0.19.1", "serde", "serde_json", - "sha2 0.10.1", + "sha2 0.10.2", "x509-parser", ] @@ -2271,7 +2452,7 @@ dependencies = [ "oak_functions_abi", "oak_functions_loader", "oak_functions_lookup", - "prost", + "prost 0.10.0", "test_utils", "tokio", ] @@ -2280,8 +2461,8 @@ dependencies = [ name = "oak_functions_abi" version = "0.1.0" dependencies = [ - "prost", - "prost-build", + "prost 0.10.0", + "prost-build 0.10.0", ] [[package]] @@ -2292,7 +2473,7 @@ dependencies = [ "async-stream", "async-trait", "base64", - "clap 3.0.14", + "clap 3.1.8", "ecdsa", "env_logger 0.9.0", "grpc_unary_attestation", @@ -2302,7 +2483,7 @@ dependencies = [ "oak_remote_attestation", "oak_utils", "p256", - "prost", + "prost 0.10.0", "regex", "serde", "serde_jcs", @@ -2335,7 +2516,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "clap 3.0.14", + "clap 3.1.8", "criterion", "futures", "grpc_unary_attestation", @@ -2354,7 +2535,7 @@ dependencies = [ "oak_logger", "oak_remote_attestation", "oak_utils", - "prost", + "prost 0.10.0", "rand 0.8.5", "serde", "serde_derive", @@ -2447,7 +2628,7 @@ dependencies = [ "log", "oak_functions_abi", "oak_logger", - "prost", + "prost 0.10.0", "serde", "serde_derive", "tract-tensorflow 0.15.9-pre", @@ -2466,7 +2647,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-stream", - "clap 3.0.14", + "clap 3.1.8", "env_logger 0.9.0", "futures", "futures-core", @@ -2478,7 +2659,7 @@ dependencies = [ "rustls 0.19.1", "serde", "serde_json", - "sha2 0.10.1", + "sha2 0.10.2", "tokio", "tokio-rustls 0.22.0", ] @@ -2505,7 +2686,7 @@ name = "oak_proxy_attestation" version = "0.1.0" dependencies = [ "anyhow", - "clap 3.0.14", + "clap 3.1.8", "env_logger 0.9.0", "futures", "futures-core", @@ -2515,7 +2696,7 @@ dependencies = [ "oak_attestation_common", "oak_utils", "openssl", - "prost", + "prost 0.10.0", "tokio", "tonic", ] @@ -2528,8 +2709,8 @@ dependencies = [ "assert_matches", "bytes", "log", - "prost", - "prost-build", + "prost 0.10.0", + "prost-build 0.10.0", "quickcheck", "quickcheck_macros", "ring", @@ -2541,7 +2722,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-stream", - "clap 3.0.14", + "clap 3.1.8", "env_logger 0.9.0", "futures", "futures-core", @@ -2551,7 +2732,7 @@ dependencies = [ "log", "oak_attestation_common", "rustls 0.19.1", - "sha2 0.10.1", + "sha2 0.10.2", "tokio", "tokio-rustls 0.22.0", ] @@ -2561,8 +2742,8 @@ name = "oak_utils" version = "0.1.0" dependencies = [ "proc-macro2", - "prost", - "prost-build", + "prost 0.10.0", + "prost-build 0.10.0", "quote", "tempfile", "tonic-build", @@ -2581,18 +2762,18 @@ dependencies = [ [[package]] name = "oid-registry" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe554cb2393bc784fd678c82c84cc0599c31ceadc7f03a594911f822cb8d1815" +checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a" dependencies = [ - "der-parser", + "asn1-rs", ] [[package]] name = "once_cell" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" [[package]] name = "oorandom" @@ -2674,9 +2855,9 @@ checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" [[package]] name = "paste" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" +checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" [[package]] name = "pem-rfc7468" @@ -2791,9 +2972,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "plotters" @@ -2825,9 +3006,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.3" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8f1882177b17c98ec33a51f5910ecbf4db92ca0def706781a1f8d0c661f393" +checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba" dependencies = [ "bitflags", "crc32fast", @@ -2847,6 +3028,16 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +[[package]] +name = "prettyplease" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b83ec2d0af5c5c556257ff52c9f98934e243b9fd39604bfb2a9b75ec2e97f18" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2917,7 +3108,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.9.0", +] + +[[package]] +name = "prost" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bd5316aa8f5c82add416dfbc25116b84b748a21153f512917e8143640a71bbd" +dependencies = [ + "bytes", + "prost-derive 0.10.0", ] [[package]] @@ -2933,8 +3134,30 @@ dependencies = [ "log", "multimap", "petgraph", - "prost", - "prost-types", + "prost 0.9.0", + "prost-types 0.9.0", + "regex", + "tempfile", + "which", +] + +[[package]] +name = "prost-build" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "328f9f29b82409216decb172d81e936415d21245befa79cd34c3f29d87d1c50b" +dependencies = [ + "bytes", + "cfg-if", + "cmake", + "heck 0.4.0", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prost 0.10.0", + "prost-types 0.10.0", "regex", "tempfile", "which", @@ -2953,6 +3176,19 @@ dependencies = [ "syn", ] +[[package]] +name = "prost-derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df35198f0777b75e9ff669737c6da5136b59dba33cf5a010a6d1cc4d56defc6f" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost-types" version = "0.9.0" @@ -2960,14 +3196,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes", - "prost", + "prost 0.9.0", +] + +[[package]] +name = "prost-types" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "926681c118ae6e512a3ccefd4abbe5521a14f4cc1e207356d4d00c0b7f2006fd" +dependencies = [ + "bytes", + "prost 0.10.0", ] [[package]] name = "psm" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eca0fa5dd7c4c96e184cec588f0b1db1ee3165e678db21c09793105acb17e6f" +checksum = "871372391786ccec00d3c5d3d6608905b3d4db263639cfe075d3b60a736d115a" dependencies = [ "cc", ] @@ -2996,9 +3242,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" dependencies = [ "proc-macro2", ] @@ -3116,21 +3362,22 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ "bitflags", ] [[package]] name = "redox_users" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", "redox_syscall", + "thiserror", ] [[package]] @@ -3246,9 +3493,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.33.4" +version = "0.33.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef7ec6a44fba95d21fa522760c03c16ca5ee95cebb6e4ef579cab3e6d7ba6c06" +checksum = "03627528abcc4a365554d32a9f3bbf67f7694c102cfeda792dc86a2d6057cc85" dependencies = [ "bitflags", "errno", @@ -3275,9 +3522,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b323592e3164322f5b193dc4302e4e36cd8d37158a712d664efae1a5c2791700" +checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" dependencies = [ "log", "ring", @@ -3287,33 +3534,30 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" +checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" dependencies = [ "openssl-probe", - "rustls 0.19.1", + "rustls-pemfile 0.2.1", "schannel", "security-framework", ] [[package]] -name = "rustls-native-certs" -version = "0.6.1" +name = "rustls-pemfile" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" +checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", + "base64", ] [[package]] name = "rustls-pemfile" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" dependencies = [ "base64", ] @@ -3358,6 +3602,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "scan_fmt" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b53b0a5db882a8e2fdaae0a43f7b39e7e9082389e978398bdf223a55b581248" +dependencies = [ + "regex", +] + [[package]] name = "schannel" version = "0.1.19" @@ -3438,9 +3691,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0486718e92ec9a68fbed73bb5ef687d71103b142595b406835649bebd33f72c7" +checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" dependencies = [ "serde", ] @@ -3536,13 +3789,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec" +checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.2", + "digest 0.10.3", ] [[package]] @@ -3585,9 +3838,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "smallvec" @@ -3669,9 +3922,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.86" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f" dependencies = [ "proc-macro2", "quote", @@ -3684,6 +3937,18 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + [[package]] name = "system-interface" version = "0.20.0" @@ -3736,7 +4001,7 @@ name = "tensorflow_client" version = "0.1.0" dependencies = [ "anyhow", - "clap 3.0.14", + "clap 3.1.8", "env_logger 0.9.0", "flate2", "hyper", @@ -3746,8 +4011,8 @@ dependencies = [ "oak_functions_abi", "oak_functions_client", "oak_utils", - "prost", - "prost-types", + "prost 0.10.0", + "prost-types 0.10.0", "tokio", "tonic", ] @@ -3759,7 +4024,7 @@ dependencies = [ "anyhow", "async-stream", "bytes", - "clap 3.0.14", + "clap 3.1.8", "env_logger 0.9.0", "futures", "grpc_unary_attestation", @@ -3769,8 +4034,8 @@ dependencies = [ "oak_remote_attestation", "oak_utils", "pin-project-lite", - "prost", - "prost-types", + "prost 0.10.0", + "prost-types 0.10.0", "sync_wrapper", "tokio", "tonic", @@ -3779,9 +4044,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] @@ -3799,7 +4064,7 @@ dependencies = [ "oak_functions_client", "oak_remote_attestation", "port_check", - "prost", + "prost 0.10.0", "tokio", ] @@ -3814,9 +4079,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.14.2" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" @@ -3868,6 +4133,24 @@ dependencies = [ "winapi", ] +[[package]] +name = "time" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" +dependencies = [ + "itoa 1.0.1", + "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 = "tinytemplate" version = "1.2.1" @@ -3895,9 +4178,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.16.1" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" +checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" dependencies = [ "bytes", "libc", @@ -3907,6 +4190,7 @@ dependencies = [ "once_cell", "pin-project-lite", "signal-hook-registry", + "socket2", "tokio-macros", "winapi", ] @@ -3945,11 +4229,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" +checksum = "4151fda0cf2798550ad0b34bcfc9b9dcc2a9d2471c895c68f3a8818e54f2389e" dependencies = [ - "rustls 0.20.3", + "rustls 0.20.4", "tokio", "webpki 0.22.0", ] @@ -3967,16 +4251,16 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.9" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" dependencies = [ "bytes", "futures-core", "futures-sink", - "log", "pin-project-lite", "tokio", + "tracing", ] [[package]] @@ -3990,12 +4274,13 @@ dependencies = [ [[package]] name = "tonic" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" +checksum = "30fb54bf1e446f44d870d260d99957e7d11fb9d0a0f5bd1a662ad1411cc103f9" dependencies = [ "async-stream", "async-trait", + "axum", "base64", "bytes", "futures-core", @@ -4007,11 +4292,12 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost", - "prost-derive", - "rustls-native-certs 0.5.0", + "prost 0.10.0", + "prost-derive 0.10.0", + "rustls-native-certs", + "rustls-pemfile 0.3.0", "tokio", - "tokio-rustls 0.22.0", + "tokio-rustls 0.23.3", "tokio-stream", "tokio-util", "tower", @@ -4023,21 +4309,22 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" +checksum = "4d17087af5c80e5d5fc8ba9878e60258065a0a757e35efe7a05b7904bece1943" dependencies = [ + "prettyplease", "proc-macro2", - "prost-build", + "prost-build 0.10.0", "quote", "syn", ] [[package]] name = "tonic-web" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5802af338d3f01590a5c0777783f0e0897df05e9b053ac0084e310a9319a456" +checksum = "3864b1194b9b39ba01fc8f6640dc5554ded967ccaebdd8033341987f6c776431" dependencies = [ "base64", "bytes", @@ -4053,9 +4340,9 @@ dependencies = [ [[package]] name = "tower" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5651b5f6860a99bd1adb59dbfe1db8beb433e73709d9032b413a77e2fb7c066a" +checksum = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e" dependencies = [ "futures-core", "futures-util", @@ -4065,13 +4352,31 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-stream", "tokio-util", "tower-layer", "tower-service", "tracing", ] +[[package]] +name = "tower-http" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aba3f3efabf7fb41fae8534fc20a817013dd1c12cb45441efb6c82e6556b4cd8" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.1" @@ -4086,9 +4391,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.30" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d8d93354fe2a8e50d5953f5ae2e47a3fc2ef03292e7ea46e3cc38f549525fb9" +checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" dependencies = [ "cfg-if", "log", @@ -4099,9 +4404,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716" +checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" dependencies = [ "proc-macro2", "quote", @@ -4110,9 +4415,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.22" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" +checksum = "90442985ee2f57c9e1b548ee72ae842f4a9a20e3f417cc38dbc5dc684d9bb4ee" dependencies = [ "lazy_static", ] @@ -4129,9 +4434,8 @@ dependencies = [ [[package]] name = "tract-core" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec224e77668b0857a0b93b21994323672e53479057cfa8fb4a6987086c9c879" +version = "0.15.9-pre" +source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" dependencies = [ "anyhow", "bit-set", @@ -4139,7 +4443,6 @@ dependencies = [ "downcast-rs", "dyn-clone", "educe", - "half", "lazy_static", "log", "maplit", @@ -4147,14 +4450,15 @@ dependencies = [ "num-integer", "num-traits 0.2.14", "smallvec", - "tract-data 0.15.8", - "tract-linalg 0.15.8", + "tract-data 0.15.9-pre", + "tract-linalg 0.15.9-pre", ] [[package]] name = "tract-core" -version = "0.15.9-pre" -source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9594754f9e42e8e3118b48ebbd035afb647e2167c2fd63f0d8df704aa0dd2516" dependencies = [ "anyhow", "bit-set", @@ -4169,15 +4473,14 @@ dependencies = [ "num-integer", "num-traits 0.2.14", "smallvec", - "tract-data 0.15.9-pre", - "tract-linalg 0.15.9-pre", + "tract-data 0.16.3", + "tract-linalg 0.16.3", ] [[package]] name = "tract-data" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1609c2b286a347d3040c7234e204de170920ec3709b15521defe098c0f8a5a67" +version = "0.15.9-pre" +source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" dependencies = [ "anyhow", "educe", @@ -4194,8 +4497,9 @@ dependencies = [ [[package]] name = "tract-data" -version = "0.15.9-pre" -source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f17b4f511942899e0caa8f50f3d41d37f142fcd5437e11230fe3da752e30aa4" dependencies = [ "anyhow", "educe", @@ -4212,55 +4516,54 @@ dependencies = [ [[package]] name = "tract-hir" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b579830105a172704676ca4da670931010577070e869724be6740ec43d4cc3eb" +version = "0.15.9-pre" +source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" dependencies = [ "derive-new", "educe", "log", - "tract-core 0.15.8", + "tract-core 0.15.9-pre", ] [[package]] name = "tract-hir" -version = "0.15.9-pre" -source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc2ed4817da3e2bd1847b999a9748cde5b34fc785a31ee5e589e51bf2a078dac" dependencies = [ "derive-new", "educe", "log", - "tract-core 0.15.9-pre", + "tract-core 0.16.3", ] [[package]] name = "tract-linalg" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f51d85987d90f5e6479dbe203cbf259eb9208ff4e1c94870ab0ca61492171bb" +version = "0.15.9-pre" +source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" dependencies = [ "cc", "derive-new", "downcast-rs", "dyn-clone", "educe", - "half", "lazy_static", "libc", - "liquid", + "liquid 0.23.1", "log", "num-traits 0.2.14", "paste", "smallvec", - "tract-data 0.15.8", + "tract-data 0.15.9-pre", "unicode-normalization", "walkdir", ] [[package]] name = "tract-linalg" -version = "0.15.9-pre" -source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57757e093013be94c7f0f7e435dc7c789d7f5623ac05aeaec1050ded165fae5c" dependencies = [ "cc", "derive-new", @@ -4269,120 +4572,121 @@ dependencies = [ "educe", "lazy_static", "libc", - "liquid", + "liquid 0.24.0", "log", "num-traits 0.2.14", "paste", + "scan_fmt", "smallvec", - "tract-data 0.15.9-pre", + "tract-data 0.16.3", "unicode-normalization", "walkdir", ] [[package]] name = "tract-nnef" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b15a11fea45a9f69c595cf386c87e4c3cd45d1323e7b5f430004a8cd11d2c4" +version = "0.15.9-pre" +source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" dependencies = [ "byteorder", "flate2", "log", "nom", "tar", - "tract-core 0.15.8", + "tract-core 0.15.9-pre", "walkdir", ] [[package]] name = "tract-nnef" -version = "0.15.9-pre" -source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1acdc9abc0bdee43d1fc43eddc30a47524324301e350d227f6f6751d9de477f1" dependencies = [ "byteorder", "flate2", "log", "nom", "tar", - "tract-core 0.15.9-pre", + "tract-core 0.16.3", "walkdir", ] [[package]] name = "tract-pulse" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f73e30e7f4ecec6f10647129bb15ae8860054511c10df6605d16dd4469788c" +version = "0.15.9-pre" +source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" dependencies = [ "downcast-rs", "lazy_static", - "tract-pulse-opl 0.15.8", + "tract-pulse-opl 0.15.9-pre", ] [[package]] name = "tract-pulse" -version = "0.15.9-pre" -source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e590b96bd8d2dd695e28bd652a7c29820a783f81b396c8a37fc7491b0efcf1" dependencies = [ "downcast-rs", "lazy_static", - "tract-pulse-opl 0.15.9-pre", + "tract-pulse-opl 0.16.3", ] [[package]] name = "tract-pulse-opl" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef93106507b67b5eeae701f5b2b47613ce462f4fdbcbb798768f3b987a3462ce" +version = "0.15.9-pre" +source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" dependencies = [ "downcast-rs", "lazy_static", - "tract-nnef 0.15.8", + "tract-nnef 0.15.9-pre", ] [[package]] name = "tract-pulse-opl" -version = "0.15.9-pre" -source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66c8a14d0d91d2de7fe08dc1a99cad6902c68cd0b11d067dbbf243c03bd37ec9" dependencies = [ "downcast-rs", "lazy_static", - "tract-nnef 0.15.9-pre", + "tract-nnef 0.16.3", ] [[package]] name = "tract-tensorflow" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87de8f474d4ea815dbbd991ac4e3cc05dd657b535e5b81029f8ffa598e3a8a86" +version = "0.15.9-pre" +source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" dependencies = [ "bytes", "derive-new", "educe", "log", "mapr", - "prost", - "prost-build", - "prost-types", - "tract-hir 0.15.8", - "tract-pulse 0.15.8", + "prost 0.9.0", + "prost-build 0.9.0", + "prost-types 0.9.0", + "tract-hir 0.15.9-pre", + "tract-pulse 0.15.9-pre", ] [[package]] name = "tract-tensorflow" -version = "0.15.9-pre" -source = "git+https://github.com/sonos/tract.git?rev=124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4#124dc4c8d31f01ae73a2ec3cc02c0cf3db7a13d4" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f2f0cb740c795fa11ebd07316b5f738b13055ad1d369c59a158d48613254b6" dependencies = [ "bytes", "derive-new", "educe", "log", "mapr", - "prost", - "prost-build", - "prost-types", - "tract-hir 0.15.9-pre", - "tract-pulse 0.15.9-pre", + "prost 0.9.0", + "prost-build 0.9.0", + "prost-types 0.9.0", + "tract-hir 0.16.3", + "tract-pulse 0.16.3", ] [[package]] @@ -4394,7 +4698,7 @@ name = "trusted_shuffler_backend" version = "0.1.0" dependencies = [ "anyhow", - "clap 3.0.14", + "clap 3.1.8", "env_logger 0.9.0", "futures-core", "futures-util", @@ -4409,7 +4713,7 @@ name = "trusted_shuffler_client" version = "0.1.0" dependencies = [ "anyhow", - "clap 3.0.14", + "clap 3.1.8", "env_logger 0.9.0", "http", "hyper", @@ -4433,7 +4737,7 @@ name = "trusted_shuffler_server" version = "0.1.0" dependencies = [ "anyhow", - "clap 3.0.14", + "clap 3.1.8", "env_logger 0.9.0", "futures-core", "futures-util", @@ -4552,11 +4856,17 @@ version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasi-cap-std-sync" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c8a21d19ad46499a6611da6d74636f19a6bebaaaa85254b2bec4392493abe2c" +checksum = "09b1c389a029e158b3dbb1be62d47ffcd959db94eeafd0d8c38bef15e6097fae" dependencies = [ "anyhow", "async-trait", @@ -4578,9 +4888,9 @@ dependencies = [ [[package]] name = "wasi-common" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ee711ef917d4250d1b6d430d6b7f3a4820f52940fb59beb761297998ff7528" +checksum = "7cd93ae0ba21453de39b6c08c5c22ce6ff75393e3094e449631d7dcd562495c3" dependencies = [ "anyhow", "bitflags", @@ -4694,9 +5004,9 @@ checksum = "0559cc0f1779240d6f894933498877ea94f693d84f3ee39c9a9932c6c312bd70" [[package]] name = "wasmtime" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4882e78d9daceeaff656d82869f298fd472ea8d8ccf96fbd310da5c1687773ac" +checksum = "cc8463ad287e1d87d9a141a010cbe4b3f8227ade85cc8ac64f2bef3219b66f94" dependencies = [ "anyhow", "async-trait", @@ -4728,9 +5038,9 @@ dependencies = [ [[package]] name = "wasmtime-cache" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5b9af2d970624455f9ea109acc60cc477afe097f86c190eb519a8b7d6646cd" +checksum = "b066cd527050ed06eba8f4eb8948d833f033401f09313a5e5231ebe3e316bb9d" dependencies = [ "anyhow", "base64", @@ -4748,9 +5058,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed6ff21d2dbfe568af483f0c508e049fc6a497c73635e2c50c9b1baf3a93ed8" +checksum = "381b034926e26980a0aed3f26ec4ba2ff3be9763f386bfb18b7bf2a3fbc1a284" dependencies = [ "anyhow", "cranelift-codegen", @@ -4770,9 +5080,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "860936d38df423b4291b3e31bc28d4895e2208f9daba351c2397d18a0a10e0bf" +checksum = "877230e7f92f8b5509845e804bb27c7c993197339a7cf0de4a2af411ee6ea75b" dependencies = [ "anyhow", "cranelift-entity", @@ -4790,9 +5100,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e285306aa274d85a22753bef826226e1cc473bac0b541523f46dccf80751cc" +checksum = "dffb509e67c6c2ea49f38bd5db3712476fcc94c4776521012e5f69ae4bb27b4a" dependencies = [ "cc", "rustix", @@ -4801,9 +5111,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e794310a0df5266c7ac73e8211a024a49e3860ac0ca2af5db8527be942ad063e" +checksum = "4ee2da33bb337fbdfb6e031d485bf2a39d51f37f48e79c6327228d3fc68ec531" dependencies = [ "addr2line", "anyhow", @@ -4826,9 +5136,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ffe5cb3db705ea43fcf37475a79891a3ada754c1cbe333540879649de943d5" +checksum = "bcb5bd981c971c398dac645874748f261084dc907a98b3ee70fa41e005a2b365" dependencies = [ "anyhow", "backtrace", @@ -4852,9 +5162,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a5b60d70c1927c5a403f7c751de179414b6b91da75b2312c3ae78196cf9dc3" +checksum = "73696a97fb815c2944896ae9e4fc49182fd7ec0b58088f9ad9768459a521e347" dependencies = [ "cranelift-entity", "serde", @@ -4864,9 +5174,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23fa6fbbad7e6f7dfe5fc0127ecd4bca409e3dcb51596b10ccf4949ac450d4c9" +checksum = "08a84b460a4d493d7f81dff72cfab35388e621e314ea38f56c18579bc15e6693" dependencies = [ "anyhow", "wasi-cap-std-sync", @@ -4916,7 +5226,7 @@ dependencies = [ "oak_functions_abi", "oak_functions_loader", "oak_functions_lookup", - "prost", + "prost 0.10.0", "rand 0.8.5", "serde", "serde_json", @@ -4964,9 +5274,9 @@ checksum = "d8b77fdfd5a253be4ab714e4ffa3c49caf146b4de743e97510c0656cf90f1e8e" [[package]] name = "which" -version = "4.2.4" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2" +checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" dependencies = [ "either", "lazy_static", @@ -4975,9 +5285,9 @@ dependencies = [ [[package]] name = "wiggle" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11fb3417e7e14c88f2d9ee6c3746ba6b71f4000f7f4d1450b219a278f39d31e8" +checksum = "c3b8257a2ab818e9ce3f1b54c6f2dec674066c0e03d7dd8a6c73f72dab9919d4" dependencies = [ "anyhow", "async-trait", @@ -4990,9 +5300,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c36b9602eda8612e2338c4f39728046819b3bc2ed71a474c5c108f5b54e1f9" +checksum = "cd4ff909fb2ba62ebbdde749e4273f495cd5db962262aa1b15f6087c42828aad" dependencies = [ "anyhow", "heck 0.3.3", @@ -5005,9 +5315,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "0.34.1" +version = "0.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abd843bbf81370dba59cb869cb50d8e369e82b809f84b6a8db23d6b2394e50e8" +checksum = "144e7e767f8b39649c8a97f3f4732b73a4f0337f2a6f0c96cedcb15e52bec9f6" dependencies = [ "proc-macro2", "quote", @@ -5087,12 +5397,12 @@ dependencies = [ [[package]] name = "x509-parser" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc90836a84cb72e6934137b1504d0cae304ef5d83904beb0c8d773bbfe256ed" +checksum = "e64bcfe6a33d9a2d5451de520881469863bd05a095f6b6f7f2ad1a5cd8d4ea2f" dependencies = [ + "asn1-rs", "base64", - "chrono", "data-encoding", "der-parser", "lazy_static", @@ -5100,6 +5410,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", + "time 0.3.9", ] [[package]] @@ -5119,7 +5430,7 @@ dependencies = [ "async-trait", "cargo_metadata", "chrono", - "clap 3.0.14", + "clap 3.1.8", "clap_complete", "colored", "itertools", @@ -5147,9 +5458,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.2" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c88870063c39ee00ec285a2f8d6a966e5b6fb2becc4e8dac77ed0d370ed6006" +checksum = "7eb5728b8afd3f280a869ce1d4c554ffaed35f45c231fc41bfbd0381bef50317" [[package]] name = "zstd" diff --git a/oak_functions/client/rust/src/rekor.rs b/oak_functions/client/rust/src/rekor.rs index c14482f2ec3..be8dcf700e5 100644 --- a/oak_functions/client/rust/src/rekor.rs +++ b/oak_functions/client/rust/src/rekor.rs @@ -101,7 +101,7 @@ impl TryFrom<&LogEntry> for RekorSignatureBundle { let sig_base64 = log_entry .verification .as_ref() - .ok_or(anyhow::anyhow!("no verification field in the log entry"))? + .ok_or_else(|| anyhow::anyhow!("no verification field in the log entry"))? .signed_entry_timestamp .clone(); let sig_bytes = sig_base64.as_str().as_bytes(); diff --git a/oak_functions/loader/fuzz/fuzz_targets/data/fuzzable.wasm b/oak_functions/loader/fuzz/fuzz_targets/data/fuzzable.wasm index 7d3a2723e36..864badb4711 100755 Binary files a/oak_functions/loader/fuzz/fuzz_targets/data/fuzzable.wasm and b/oak_functions/loader/fuzz/fuzz_targets/data/fuzzable.wasm differ diff --git a/xtask/src/main.rs b/xtask/src/main.rs index a1be3a9f343..bb3db6de03e 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -379,7 +379,7 @@ fn run_completion(completion: &Completion) -> Step { let mut file = std::fs::File::create(completion.file_name.clone()).expect("file not created"); clap_complete::generate( clap_complete::Shell::Bash, - &mut Opt::into_app(), + &mut Opt::command(), "xtask", &mut file, );