Merge pull request #820 from fortanix/raoul/rte-573-patch_protobuf_vuln

[RTE-573] Patch protobuf vuln

Author: raoulstrackx

Cargo.lock

@@ -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" }

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aesm-client"
-version = "0.6.1"
+version = "0.6.2"
 authors = ["Fortanix, Inc."]
 license = "MPL-2.0"
 description = """
@@ -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
 
@@ -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" }

intel-sgx/aesm-client/Cargo.toml

@@ -6,8 +6,6 @@
 
 #![deny(warnings)]
 
-extern crate protoc_rust;
-
 use std::env;
 use std::fs::File;
 use std::io::Write;
@@ -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"))