This is an automated email from the ASF dual-hosted git repository. hsun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
commit 1db660d35e2698c1e1a97cd21ca2264f27fad0a2 Author: GeminiCarrie <[email protected]> AuthorDate: Wed May 10 04:42:13 2023 +0000 Update rustls --- attestation/Cargo.toml | 2 +- cli/Cargo.toml | 2 +- cmake/tomls/Cargo.sgx_trusted_lib.lock | 133 ++++++++++++++++++++++--------- cmake/tomls/Cargo.sgx_trusted_lib.toml | 1 + cmake/tomls/Cargo.sgx_untrusted_app.lock | 16 ++-- cmake/tomls/Cargo.unix_app.lock | 12 +-- rpc/Cargo.toml | 2 +- tests/integration/enclave/Cargo.toml | 2 +- 8 files changed, 112 insertions(+), 58 deletions(-) diff --git a/attestation/Cargo.toml b/attestation/Cargo.toml index bf94baaa..972dda7b 100644 --- a/attestation/Cargo.toml +++ b/attestation/Cargo.toml @@ -58,7 +58,7 @@ libc = { version = "0.2.66", optional = true } log = { version = "0.4.17", features = ["release_max_level_info"] } num-bigint = { version = "0.2.2" } percent-encoding = { version = "2.1.0" } -rustls = { version = "0.17.0", features = ["dangerous_configuration"] } +rustls = { version = "0.19.0", features = ["dangerous_configuration"] } serde = { version = "1.0.92", features = ["derive"] } serde_json = { version = "1.0.39" } thiserror = { version = "1.0.9" } diff --git a/cli/Cargo.toml b/cli/Cargo.toml index cd50bc32..06728757 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -33,6 +33,6 @@ teaclave_attestation = { path = "../attestation" } env_logger = { version = "0.7.1" } webpki-roots = { version = "0.21.0" } webpki = { version = "0.21.0" } -rustls = { version = "0.17.0", features = ["dangerous_configuration"] } +rustls = { version = "0.19.0", features = ["dangerous_configuration"] } http = { version = "0.2" } pem = "0.7.0" diff --git a/cmake/tomls/Cargo.sgx_trusted_lib.lock b/cmake/tomls/Cargo.sgx_trusted_lib.lock index 1e832dc0..8f4d145a 100644 --- a/cmake/tomls/Cargo.sgx_trusted_lib.lock +++ b/cmake/tomls/Cargo.sgx_trusted_lib.lock @@ -23,12 +23,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - [[package]] name = "base64" version = "0.12.3" @@ -324,7 +318,7 @@ dependencies = [ [[package]] name = "gbdt" version = "0.1.1" -source = "git+https://github.com/apache/incubator-teaclave-crates#4c9325839e94bb8e280898f94c98a79cdc025312"; +source = "git+https://github.com/apache/incubator-teaclave-crates#ede1f68d891798fe6cf995e33281f01d59be9320"; dependencies = [ "cfg-if 0.1.10", "rand", @@ -337,7 +331,7 @@ dependencies = [ [[package]] name = "getrandom" version = "0.2.6" -source = "git+https://github.com/apache/incubator-teaclave-crates#4c9325839e94bb8e280898f94c98a79cdc025312"; +source = "git+https://github.com/apache/incubator-teaclave-crates#ede1f68d891798fe6cf995e33281f01d59be9320"; dependencies = [ "cfg-if 1.0.0", "libc", @@ -484,7 +478,7 @@ dependencies = [ [[package]] name = "image" version = "0.23.14" -source = "git+https://github.com/apache/incubator-teaclave-crates#4c9325839e94bb8e280898f94c98a79cdc025312"; +source = "git+https://github.com/apache/incubator-teaclave-crates#ede1f68d891798fe6cf995e33281f01d59be9320"; dependencies = [ "bytemuck", "byteorder", @@ -669,13 +663,12 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] name = "mio" version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +source = "git+https://github.com/apache/incubator-teaclave-crates#ede1f68d891798fe6cf995e33281f01d59be9320"; dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -798,7 +791,7 @@ dependencies = [ [[package]] name = "num_cpus" version = "1.14.0" -source = "git+https://github.com/apache/incubator-teaclave-crates#4c9325839e94bb8e280898f94c98a79cdc025312"; +source = "git+https://github.com/apache/incubator-teaclave-crates#ede1f68d891798fe6cf995e33281f01d59be9320"; dependencies = [ "hermit-abi", "libc", @@ -958,7 +951,7 @@ dependencies = [ [[package]] name = "rand" version = "0.8.5" -source = "git+https://github.com/apache/incubator-teaclave-crates#4c9325839e94bb8e280898f94c98a79cdc025312"; +source = "git+https://github.com/apache/incubator-teaclave-crates#ede1f68d891798fe6cf995e33281f01d59be9320"; dependencies = [ "libc", "rand_chacha", @@ -968,7 +961,7 @@ dependencies = [ [[package]] name = "rand_chacha" version = "0.3.1" -source = "git+https://github.com/apache/incubator-teaclave-crates#4c9325839e94bb8e280898f94c98a79cdc025312"; +source = "git+https://github.com/apache/incubator-teaclave-crates#ede1f68d891798fe6cf995e33281f01d59be9320"; dependencies = [ "ppv-lite86", "rand_core 0.6.4 (git+https://github.com/apache/incubator-teaclave-crates)", @@ -986,7 +979,7 @@ dependencies = [ [[package]] name = "rand_core" version = "0.6.4" -source = "git+https://github.com/apache/incubator-teaclave-crates#4c9325839e94bb8e280898f94c98a79cdc025312"; +source = "git+https://github.com/apache/incubator-teaclave-crates#ede1f68d891798fe6cf995e33281f01d59be9320"; dependencies = [ "getrandom", ] @@ -1084,7 +1077,7 @@ dependencies = [ [[package]] name = "ring" version = "0.16.20" -source = "git+https://github.com/apache/incubator-teaclave-crates#4c9325839e94bb8e280898f94c98a79cdc025312"; +source = "git+https://github.com/apache/incubator-teaclave-crates#ede1f68d891798fe6cf995e33281f01d59be9320"; dependencies = [ "cc", "libc", @@ -1107,7 +1100,7 @@ dependencies = [ [[package]] name = "rustface" version = "0.1.7" -source = "git+https://github.com/apache/incubator-teaclave-crates#4c9325839e94bb8e280898f94c98a79cdc025312"; +source = "git+https://github.com/apache/incubator-teaclave-crates#ede1f68d891798fe6cf995e33281f01d59be9320"; dependencies = [ "byteorder", "image", @@ -1132,10 +1125,10 @@ dependencies = [ [[package]] name = "rustls" -version = "0.17.0" -source = "git+https://github.com/apache/incubator-teaclave-crates#4c9325839e94bb8e280898f94c98a79cdc025312"; +version = "0.19.1" +source = "git+https://github.com/apache/incubator-teaclave-crates#ede1f68d891798fe6cf995e33281f01d59be9320"; dependencies = [ - "base64 0.11.0", + "base64 0.13.1", "log", "ring", "sct", @@ -1158,7 +1151,7 @@ dependencies = [ [[package]] name = "rusty-machine" version = "0.5.4" -source = "git+https://github.com/apache/incubator-teaclave-crates#4c9325839e94bb8e280898f94c98a79cdc025312"; +source = "git+https://github.com/apache/incubator-teaclave-crates#ede1f68d891798fe6cf995e33281f01d59be9320"; dependencies = [ "num 0.1.42", "rand", @@ -2510,13 +2503,13 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", ] [[package]] @@ -2525,7 +2518,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", ] [[package]] @@ -2534,13 +2536,28 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -2549,42 +2566,84 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + [[package]] name = "windows_i686_gnu" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + [[package]] name = "windows_i686_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + [[package]] name = "windows_x86_64_gnu" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + [[package]] name = "windows_x86_64_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + [[package]] name = "winreg" version = "0.10.1" diff --git a/cmake/tomls/Cargo.sgx_trusted_lib.toml b/cmake/tomls/Cargo.sgx_trusted_lib.toml index b07e2c81..333f7c6c 100644 --- a/cmake/tomls/Cargo.sgx_trusted_lib.toml +++ b/cmake/tomls/Cargo.sgx_trusted_lib.toml @@ -58,6 +58,7 @@ simple_asn1 = { git = "https://github.com/acw/simple_asn1";, rev = "7db7a48 gbdt = { git = "https://github.com/apache/incubator-teaclave-crates"; } getrandom = { git = "https://github.com/apache/incubator-teaclave-crates"; } image = { git = "https://github.com/apache/incubator-teaclave-crates"; } +mio = { git = "https://github.com/apache/incubator-teaclave-crates"; } num_cpus = { git = "https://github.com/apache/incubator-teaclave-crates"; } rand = { git = "https://github.com/apache/incubator-teaclave-crates"; } ring = { git = "https://github.com/apache/incubator-teaclave-crates"; } diff --git a/cmake/tomls/Cargo.sgx_untrusted_app.lock b/cmake/tomls/Cargo.sgx_untrusted_app.lock index a83bd377..30880024 100644 --- a/cmake/tomls/Cargo.sgx_untrusted_app.lock +++ b/cmake/tomls/Cargo.sgx_untrusted_app.lock @@ -52,12 +52,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - [[package]] name = "base64" version = "0.13.1" @@ -1310,7 +1304,7 @@ dependencies = [ [[package]] name = "rustface" version = "0.1.7" -source = "git+https://github.com/apache/incubator-teaclave-crates#4c9325839e94bb8e280898f94c98a79cdc025312"; +source = "git+https://github.com/apache/incubator-teaclave-crates#ede1f68d891798fe6cf995e33281f01d59be9320"; dependencies = [ "byteorder", "image", @@ -1321,11 +1315,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.17.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "base64 0.11.0", + "base64 0.13.1", "log", "ring", "sct", @@ -1335,7 +1329,7 @@ dependencies = [ [[package]] name = "rusty-machine" version = "0.5.4" -source = "git+https://github.com/apache/incubator-teaclave-crates#4c9325839e94bb8e280898f94c98a79cdc025312"; +source = "git+https://github.com/apache/incubator-teaclave-crates#ede1f68d891798fe6cf995e33281f01d59be9320"; dependencies = [ "num 0.1.42", "rand 0.8.5", diff --git a/cmake/tomls/Cargo.unix_app.lock b/cmake/tomls/Cargo.unix_app.lock index 4870b39a..389a6442 100644 --- a/cmake/tomls/Cargo.unix_app.lock +++ b/cmake/tomls/Cargo.unix_app.lock @@ -1412,11 +1412,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.17.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "base64 0.11.0", + "base64 0.13.1", "log", "ring", "sct 0.6.1", @@ -1860,7 +1860,7 @@ dependencies = [ "log", "num-bigint", "percent-encoding", - "rustls 0.17.0", + "rustls 0.19.1", "serde", "serde_json", "sgx_crypto", @@ -1887,7 +1887,7 @@ dependencies = [ "hex", "http", "pem", - "rustls 0.17.0", + "rustls 0.19.1", "structopt", "teaclave_attestation", "teaclave_crypto", @@ -1988,7 +1988,7 @@ dependencies = [ "http", "libc", "log", - "rustls 0.17.0", + "rustls 0.19.1", "serde", "serde_json", "sgx_libc", diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 0d92b7fb..7bb664c7 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -42,7 +42,7 @@ cfg-if = { version = "0.1.9" } http = { version = "0.2" } libc = { version = "0.2.66", optional = true } log = { version = "0.4.17", features = ["release_max_level_info"] } -rustls = { version = "0.17.0", features = ["dangerous_configuration"] } +rustls = { version = "0.19.0", features = ["dangerous_configuration"] } serde = { version = "1.0.92", features = ["derive"] } serde_json = { version = "1.0.39" } thiserror = { version = "1.0.9" } diff --git a/tests/integration/enclave/Cargo.toml b/tests/integration/enclave/Cargo.toml index 83aa258c..d289618f 100644 --- a/tests/integration/enclave/Cargo.toml +++ b/tests/integration/enclave/Cargo.toml @@ -51,7 +51,7 @@ serde = { version = "1.0.92" } serde_json = { version = "1.0.39" } thiserror = { version = "1.0.9" } rand = { version = "0.8.5" } -rustls = { version = "0.17.0", features = ["dangerous_configuration"] } +rustls = { version = "0.19.0", features = ["dangerous_configuration"] } rusty-leveldb = { path = "../../../common/rusty_leveldb_sgx", default-features = false, optional = true } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
