Merge pull request #633 from fortanix/raoul/rte-126-fix_ci

Fix CI
fortanix · Aug 15, 2024 · 650da2f · 650da2f
2 parents b6f0262 + 7550ebd
commit 650da2f
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 35 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -48,6 +48,7 @@ exclude = [
 resolver = "2"
 
 [patch.crates-io]
+aws-nitro-enclaves-cose_0_1 = { git = "https://github.com/fortanix/aws-nitro-enclaves-cose.git", branch = "v0.1.0-patched", package = "aws-nitro-enclaves-cose" }
 libc = { git = "https://github.com/fortanix/libc.git", branch = "fortanixvme" }
 nix = { git = "https://github.com/fortanix/nix.git", branch = "raoul/fortanixvme_r0.20.2" }
 rustc-serialize = { git = "https://github.com/fortanix/rustc-serialize.git", branch = "portability" }

diff --git a/em-app/Cargo.toml b/em-app/Cargo.toml
@@ -18,14 +18,14 @@ mbedtls = { version = "0.12", default-features = false, features = ["rdrand", "s
 pkix = ">=0.1.2, <0.3.0"
 
 rustc-serialize = "0.3.24"
-sdkms = { version = "0.2.1", default-features = false }
+sdkms = { version = "0.3", default-features = false }
 serde = "1.0.123"
 serde_bytes = "0.11"
 serde_derive = "1.0.123"
 serde_json = "1.0"
 url = "1"
 uuid = { version = "0.6.3", features = ["v4", "serde"] }
-uuid_sdkms = { package = "uuid", version = "0.7.4", features = ["v4", "serde"] }
+uuid_sdkms = { package = "uuid", version = "0.8", features = ["v4", "serde"] }
 
 yasna = { version = "0.3", features = ["num-bigint", "bit-vec"] }
 

diff --git a/em-app/src/lib.rs b/em-app/src/lib.rs
@@ -3,6 +3,7 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#![allow(unexpected_cfgs)] // fortanixvme platform hasn't been upstreamed yet, but used in cfg
 pub extern crate serde_derive;
 
 pub mod mbedtls_hyper;

diff --git a/fortanix-vme/aws-nitro-enclaves/nitro-attestation-verify/Cargo.toml b/fortanix-vme/aws-nitro-enclaves/nitro-attestation-verify/Cargo.toml
@@ -8,9 +8,7 @@ publish = false
 [dependencies]
 chrono = "0.4"
 serde_cbor = "0.11"
-# Required until PR36 is accepted
-# https://github.com/awslabs/aws-nitro-enclaves-cose/pull/36
-aws-nitro-enclaves-cose = { version = "0.5.0", git = "https://github.com/fortanix/aws-nitro-enclaves-cose.git", branch = "raoul/crypto_abstraction_pinned", default-features = false }
+aws-nitro-enclaves-cose = { version = "0.5.0", default-features = false }
 mbedtls = { version = "0.12", features = ["rdrand", "std", "time", "ssl"], default-features = false, optional = true }
 num-bigint = "0.4"
 serde = { version = "1.0", features = ["derive"] }

diff --git a/intel-sgx/aesm-client/src/lib.rs b/intel-sgx/aesm-client/src/lib.rs
@@ -12,6 +12,10 @@
        html_favicon_url = "https://edp.fortanix.com/favicon.ico",
        html_root_url = "https://edp.fortanix.com/docs/api/")]
 #![allow(non_local_definitions)] // Required by failure
+/* The latest rust compiler has removed the lint box_pointers. This lint
+ * is used and generated by protobuf which is a dependency in this project.
+ * In order to avoid CI failures, allow the below lint. */
+#![allow(renamed_and_removed_lints)]
 #![deny(warnings)]
 
 extern crate byteorder;