Merge #316

316: Upgrade `protobuf` to enable publishing `aesm-client` r=jethrogb a=raoulstrackx Co-authored-by: Raoul Strackx <[email protected]>
fortanix · Mar 1, 2021 · a09d43e · a09d43e
2 parents d6e35bd + ce67fb0
commit a09d43e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aesm-client/Cargo.toml b/aesm-client/Cargo.toml
@@ -32,7 +32,7 @@ sgx-isa = { version = "0.3.0", path = "../sgx-isa"}
 # External dependencies
 byteorder = "1.0"          # Unlicense/MIT
 lazy_static = "1"          # MIT/Apache-2.0
-protobuf = "2.8.0"         # MIT/Apache-2.0
+protobuf = "2.19.0"        # MIT/Apache-2.0
 failure = "0.1.1"          # MIT/Apache-2.0
 failure_derive = "0.1.1"   # MIT/Apache-2.0
 

diff --git a/aesm-client/src/imp/aesm_protobuf/mod.rs b/aesm-client/src/imp/aesm_protobuf/mod.rs
@@ -50,7 +50,7 @@ impl AesmClient {
         let mut res_bytes = vec![0; res_len as usize];
         sock.read_exact(&mut res_bytes)?;
 
-        let res = T::Response::from_response(protobuf::parse_from_bytes(&res_bytes))?;
+        let res = T::Response::from_response(Message::parse_from_bytes(&res_bytes))?;
         Ok(res)
     }