Merge pull request #342 from fortanix/yx/bump-mbedtls-version

Bump mbedtls to 0.12.2 to have a new version to include #339
fortanix · Jan 26, 2024 · 6bcc23e · 6bcc23e
2 parents 51429f1 + 1cd9435
commit 6bcc23e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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"

diff --git 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
@@ -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>),