Skip to content

Commit

Permalink
Update Oak and TCP dependencies.
Browse files Browse the repository at this point in the history
Cargo.lock file updates were generated using
`CARGO_BAZEL_REPIN=true bazelisk build //...`.

Change-Id: Iaa2476ab871bfcc758ea0416f1d9ac2bf741f0c1
  • Loading branch information
timonvo committed Jan 17, 2025
1 parent d7c56bd commit b6fc1d9
Show file tree
Hide file tree
Showing 13 changed files with 2,239 additions and 206 deletions.
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
build --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 --incompatible_strict_action_env
build --show_timestamps # Useful for understanding build performance.
build --@rules_rust//rust/toolchain/channel=nightly
build --@rules_rust//:rustfmt.toml=//:.rustfmt.toml
build --@rules_rust//rust/settings:rustfmt.toml=//:.rustfmt.toml
build --incompatible_merge_fixed_and_default_shell_env # https://github.com/bazelbuild/rules_rust/issues/2665
build --output_filter='^//' # Suppress warnings from external dependencies.
# Build TensorFlow with more optimizations to avoid linker OOM
Expand Down
190 changes: 190 additions & 0 deletions Cargo.bazel.lock
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,12 @@ dependencies = [
"once_cell",
]

[[package]]
name = "cesu8"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"

[[package]]
name = "cfg-if"
version = "1.0.0"
Expand Down Expand Up @@ -655,6 +661,16 @@ dependencies = [
"windows-sys 0.48.0",
]

[[package]]
name = "combine"
version = "4.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
dependencies = [
"bytes",
"memchr",
]

[[package]]
name = "command-fds"
version = "0.3.0"
Expand Down Expand Up @@ -1201,6 +1217,7 @@ dependencies = [
"ignore",
"insta",
"itertools 0.13.0",
"jni",
"lazy_static",
"libflate",
"libloading",
Expand Down Expand Up @@ -2234,6 +2251,28 @@ version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"

[[package]]
name = "jni"
version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
dependencies = [
"cesu8",
"cfg-if",
"combine",
"jni-sys",
"log",
"thiserror",
"walkdir",
"windows-sys 0.45.0",
]

[[package]]
name = "jni-sys"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"

[[package]]
name = "jobserver"
version = "0.1.31"
Expand Down Expand Up @@ -3487,6 +3526,21 @@ dependencies = [
"bytemuck",
]

[[package]]
name = "ring"
version = "0.17.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
dependencies = [
"cc",
"cfg-if",
"getrandom",
"libc",
"spin",
"untrusted",
"windows-sys 0.52.0",
]

[[package]]
name = "rle-decode-fast"
version = "1.0.3"
Expand Down Expand Up @@ -3577,6 +3631,46 @@ dependencies = [
"windows-sys 0.52.0",
]

[[package]]
name = "rustls"
version = "0.22.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
dependencies = [
"log",
"ring",
"rustls-pki-types",
"rustls-webpki",
"subtle",
"zeroize",
]

[[package]]
name = "rustls-pemfile"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
dependencies = [
"rustls-pki-types",
]

[[package]]
name = "rustls-pki-types"
version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"

[[package]]
name = "rustls-webpki"
version = "0.102.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
dependencies = [
"ring",
"rustls-pki-types",
"untrusted",
]

[[package]]
name = "rustversion"
version = "1.0.17"
Expand Down Expand Up @@ -4236,6 +4330,17 @@ dependencies = [
"syn 2.0.71",
]

[[package]]
name = "tokio-rustls"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
dependencies = [
"rustls",
"rustls-pki-types",
"tokio",
]

[[package]]
name = "tokio-stream"
version = "0.1.15"
Expand Down Expand Up @@ -4302,12 +4407,16 @@ dependencies = [
"percent-encoding",
"pin-project",
"prost",
"rustls-pemfile",
"rustls-pki-types",
"tokio",
"tokio-rustls",
"tokio-stream",
"tower",
"tower-layer",
"tower-service",
"tracing",
"webpki-roots",
]

[[package]]
Expand Down Expand Up @@ -4489,6 +4598,12 @@ version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"

[[package]]
name = "untrusted"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"

[[package]]
name = "urlencoding"
version = "2.1.3"
Expand Down Expand Up @@ -4930,6 +5045,15 @@ 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 = "5.0.0"
Expand Down Expand Up @@ -4983,6 +5107,15 @@ dependencies = [
"windows-targets 0.52.6",
]

[[package]]
name = "windows-sys"
version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
dependencies = [
"windows-targets 0.42.2",
]

[[package]]
name = "windows-sys"
version = "0.48.0"
Expand All @@ -5001,6 +5134,21 @@ dependencies = [
"windows-targets 0.52.6",
]

[[package]]
name = "windows-targets"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
"windows_aarch64_gnullvm 0.42.2",
"windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm 0.42.2",
"windows_x86_64_msvc 0.42.2",
]

[[package]]
name = "windows-targets"
version = "0.48.5"
Expand Down Expand Up @@ -5032,6 +5180,12 @@ dependencies = [
"windows_x86_64_msvc 0.52.6",
]

[[package]]
name = "windows_aarch64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"

[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.5"
Expand All @@ -5044,6 +5198,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"

[[package]]
name = "windows_aarch64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"

[[package]]
name = "windows_aarch64_msvc"
version = "0.48.5"
Expand All @@ -5056,6 +5216,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"

[[package]]
name = "windows_i686_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"

[[package]]
name = "windows_i686_gnu"
version = "0.48.5"
Expand All @@ -5074,6 +5240,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"

[[package]]
name = "windows_i686_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"

[[package]]
name = "windows_i686_msvc"
version = "0.48.5"
Expand All @@ -5086,6 +5258,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"

[[package]]
name = "windows_x86_64_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"

[[package]]
name = "windows_x86_64_gnu"
version = "0.48.5"
Expand All @@ -5098,6 +5276,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"

[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"

[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.5"
Expand All @@ -5110,6 +5294,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"

[[package]]
name = "windows_x86_64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"

[[package]]
name = "windows_x86_64_msvc"
version = "0.48.5"
Expand Down
12 changes: 6 additions & 6 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,9 @@ http_archive(

http_archive(
name = "trusted_computations_platform",
sha256 = "1b709d18a92b34a1d220915afb2c83b9ba404fe1edb209d7200c28701f16d313",
strip_prefix = "trusted-computations-platform-9002cd7d6b05500453643c05b3fe88280225be51",
url = "https://github.com/google-parfait/trusted-computations-platform/archive/9002cd7d6b05500453643c05b3fe88280225be51.tar.gz",
sha256 = "ad54d841b42a80075596338e6690cc26df3c2982e024cf73a89091589bcb9a25",
strip_prefix = "trusted-computations-platform-3ec990bdb85e6c4d2a0d68f0a8ef51cb252c9fb1",
url = "https://github.com/google-parfait/trusted-computations-platform/archive/3ec990bdb85e6c4d2a0d68f0a8ef51cb252c9fb1.tar.gz",
)

http_archive(
Expand All @@ -236,9 +236,9 @@ git_repository(

http_archive(
name = "oak",
sha256 = "d62f13a3ea3cb1e3eca2586d88545432b2d1131855704faa204d1e8f1827005f",
strip_prefix = "oak-14292b1ad1e22cfcbefcd68a7ac4dcc4711fe242",
url = "https://github.com/project-oak/oak/archive/14292b1ad1e22cfcbefcd68a7ac4dcc4711fe242.tar.gz",
sha256 = "8ceb2beae1f3e736e1d72448c8e823875ebd43c711cfd36590697fa702f338c9",
strip_prefix = "oak-42fcfac698abdd11aecf81362eb24ef412e40123",
url = "https://github.com/project-oak/oak/archive/42fcfac698abdd11aecf81362eb24ef412e40123.tar.gz",
)

load("@oak//bazel:repositories.bzl", "oak_toolchain_repositories")
Expand Down
Loading

0 comments on commit b6fc1d9

Please sign in to comment.