Skip to content

[RTE-573] Patch protobuf vuln #820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 20, 2025
Merged

[RTE-573] Patch protobuf vuln #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ef10c0
Update protobuf dependency
raoulstrackx Oct 9, 2025
23b1e4e
Rewrite FromResponse to TryFrom
raoulstrackx Oct 9, 2025
e6be3a9
Patch version bump aesm-client
raoulstrackx Oct 9, 2025
fcb79ce
Fix upstream mbedtls issue
raoulstrackx Oct 9, 2025
9ca8a0f
Point rust-mbedtls dependency to its master branch
raoulstrackx Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 61 additions & 98 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,4 @@ nix = { git = "https://github.com/fortanix/nix.git", branch = "raoul/fortanixvme
rustc-serialize = { git = "https://github.com/fortanix/rustc-serialize.git", branch = "portability" }
serde = { git = "https://github.com/fortanix/serde.git", branch = "master" }
vsock = { git = "https://github.com/fortanix/vsock-rs.git", branch = "fortanixvme" }
mbedtls = { git = "https://github.com/fortanix/rust-mbedtls.git", branch = "master" }
6 changes: 3 additions & 3 deletions intel-sgx/aesm-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "aesm-client"
version = "0.6.1"
version = "0.6.2"
authors = ["Fortanix, Inc."]
license = "MPL-2.0"
description = """
Expand Down Expand Up @@ -32,7 +32,7 @@ sgx-isa = { version = "0.4.0", path = "../sgx-isa"}
# External dependencies
byteorder = "1.0" # Unlicense/MIT
lazy_static = "1" # MIT/Apache-2.0
protobuf = "2.22.1" # MIT/Apache-2.0
protobuf = "3" # MIT/Apache-2.0
thiserror = "1.0" # MIT/Apache-2.0
anyhow = "1.0" # MIT/Apache-2.0

Expand All @@ -50,7 +50,7 @@ winapi = { version = "0.3.7", features = ["combaseapi", "enclaveapi", "memoryapi
libloading = "0.5.2"

[build-dependencies]
protoc-rust = "2.8.0" # MIT/Apache-2.0
protobuf-codegen = "3" # MIT

[dev-dependencies]
sgx-isa = { version = "0.4.0", path = "../sgx-isa" }
Expand Down
12 changes: 5 additions & 7 deletions intel-sgx/aesm-client/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

#![deny(warnings)]

extern crate protoc_rust;

use std::env;
use std::fs::File;
use std::io::Write;
Expand All @@ -16,17 +14,17 @@ use std::path::PathBuf;
fn main() {
let out_dir = PathBuf::from(env::var("OUT_DIR").expect("cargo should set OUT_DIR"));

protoc_rust::Codegen::new()
.out_dir(&out_dir)
protobuf_codegen::Codegen::new()
.includes(&["src/"])
.input("src/aesm_proto.proto")
.run()
.expect("protoc");
.cargo_out_dir("protos")
.run_from_script();

// Because of https://github.com/rust-lang/rfcs/issues/752, we can't `include!` the generated
// protobufs directly. Instead, we generate a second generated file that can be `include!`-ed.
// This trick borrowed from rust-mbedtls.

let mod_aesm_proto = out_dir.join("mod_aesm_proto.rs");
let mod_aesm_proto = out_dir.join("protos").join("mod_aesm_proto.rs");
File::create(&mod_aesm_proto)
// FIXME: get rid of `allow(bare_trait_objects)` by updateing protoc-rust
.and_then(|mut f| f.write_all(b"#[allow(bare_trait_objects)] mod aesm_proto;\n"))
Expand Down
Loading