From 1b273a52c8ba0a9ea5641c213b6a9c2c56151f52 Mon Sep 17 00:00:00 2001
From: Yuxiang Cao <yuxiang.cao@fortanix.com>
Date: Fri, 26 Jan 2024 10:07:20 -0800
Subject: [PATCH 1/2] bump mbedtls to 0.12.2

---
 Cargo.lock         | 2 +-
 mbedtls/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c59ad999a..9943b71c0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -485,7 +485,7 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 
 [[package]]
 name = "mbedtls"
-version = "0.12.1"
+version = "0.12.2"
 dependencies = [
  "async-stream",
  "bit-vec",
diff --git a/mbedtls/Cargo.toml b/mbedtls/Cargo.toml
index 78086e825..31c8e0db6 100644
--- a/mbedtls/Cargo.toml
+++ b/mbedtls/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mbedtls"
 # We jumped from v0.9 to v0.12 because v0.10 and v0.11 were based on mbedtls 3.X, which
 # we decided not to support.
-version = "0.12.1"
+version = "0.12.2"
 authors = ["Jethro Beekman <jethro@fortanix.com>"]
 build = "build.rs"
 edition = "2018"

From 1cd9435f215e2e95df303f0026befb135d617e94 Mon Sep 17 00:00:00 2001
From: Yuxiang Cao <yuxiang.cao@fortanix.com>
Date: Fri, 26 Jan 2024 10:59:30 -0800
Subject: [PATCH 2/2] style: fix lints

---
 mbedtls/src/pkcs12/mod.rs   | 1 +
 mbedtls/src/rng/ctr_drbg.rs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mbedtls/src/pkcs12/mod.rs b/mbedtls/src/pkcs12/mod.rs
index a9dc9ba93..54e5a82fa 100644
--- a/mbedtls/src/pkcs12/mod.rs
+++ b/mbedtls/src/pkcs12/mod.rs
@@ -430,6 +430,7 @@ enum Pkcs12BagSet {
     EncryptedPkcs8(Vec<u8>),
     Pkcs8(Vec<u8>),
     Cert(CertBag),
+    #[allow(dead_code)]
     UnknownBlob(Vec<u8>),
     // XXX CRL and Secret bags not supported
     //Crl(CrlBag),
diff --git a/mbedtls/src/rng/ctr_drbg.rs b/mbedtls/src/rng/ctr_drbg.rs
index a3a378234..e0e250a91 100644
--- a/mbedtls/src/rng/ctr_drbg.rs
+++ b/mbedtls/src/rng/ctr_drbg.rs
@@ -19,6 +19,7 @@ use crate::alloc_prelude::*;
 use crate::error::{IntoResult, Result};
 use crate::rng::{EntropyCallback, EntropyCallbackMut, RngCallback, RngCallbackMut};
 
+#[allow(dead_code)]
 enum EntropyHolder {
     Shared(Arc<dyn EntropyCallback + 'static>),
     Unique(Box<dyn EntropyCallbackMut + 'static>),