chore(deps): bump bitflags from 1.3.2 to 2.0.1 (#3250)

* chore(deps): bump bitflags from 1.3.2 to 2.0.1 Bumps [bitflags](https://github.com/bitflags/bitflags) from 1.3.2 to 2.0.1. - [Release notes](https://github.com/bitflags/bitflags/releases) - [Changelog](https://github.com/bitflags/bitflags/blob/main/CHANGELOG.md) - [Commits](bitflags/bitflags@1.3.2...2.0.1) --- updated-dependencies: - dependency-name: bitflags dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Update bitflag usage for the 1.0->2.0 changes Per <https://github.com/bitflags/bitflags/releases/tag/2.0.0> this changes the serialized format of items containing bitflags. * Update enclave lock files * Rust fmt --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nick Santana <[email protected]>
mobilecoinfoundation · Apr 10, 2023 · f66c071 · f66c071
1 parent 11a6767
commit f66c071
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/attest/core/Cargo.toml b/attest/core/Cargo.toml
@@ -34,7 +34,7 @@ mc-util-encodings = { path = "../../util/encodings" }
 mc-util-repr-bytes = { path = "../../util/repr-bytes", features = ["hex_fmt"] }
 
 base64 = { version = "0.21", default-features = false, features = ["alloc"] }
-bitflags = "1.3"
+bitflags = { version = "2.0", default-features = false, features = ["serde"] }
 chrono = { version = "0.4.24", default-features = false, features = ["alloc"] }
 digest = "0.10"
 displaydoc = { version = "0.2", default-features = false }

diff --git a/attest/core/src/error.rs b/attest/core/src/error.rs
@@ -390,7 +390,7 @@ pub enum ReportDetailsError {
 
 bitflags! {
     /// Revocation cause flags
-    #[derive(Deserialize, Serialize)]
+    #[derive(Clone, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
     pub struct RevocationCause: u64 {
         /// Cause reason was not given (but still revoked)
         const UNSPECIFIED = 0;

diff --git a/attest/core/src/ias/verify.rs b/attest/core/src/ias/verify.rs
@@ -336,6 +336,7 @@ impl<'src> TryFrom<&'src VerificationReport> for VerificationReportData {
             "SIGNATURE_INVALID" => Err(IasQuoteError::SignatureInvalid),
             "GROUP_REVOKED" => Err(IasQuoteError::GroupRevoked(
                 revocation_reason
+                    .clone()
                     .ok_or_else(|| JsonError::FieldMissing("revocationReason".to_string()))?,
                 platform_info_blob
                     .ok_or_else(|| JsonError::FieldMissing("platformInfoBlob".to_string()))?,

diff --git a/consensus/enclave/trusted/Cargo.lock b/consensus/enclave/trusted/Cargo.lock
diff --git a/fog/ingest/enclave/trusted/Cargo.lock b/fog/ingest/enclave/trusted/Cargo.lock
diff --git a/fog/ledger/enclave/trusted/Cargo.lock b/fog/ledger/enclave/trusted/Cargo.lock
diff --git a/fog/view/enclave/trusted/Cargo.lock b/fog/view/enclave/trusted/Cargo.lock