Merge pull request #822 from sumukhballal/update-aws-dependencies

Updated aws-sdk-kms dependencies & use default tls for reqwest
awslabs · Sep 10, 2024 · 935a17b · 935a17b
2 parents ecab7eb + a329db4
commit 935a17b
Show file tree

Hide file tree

Showing 3 changed files with 134 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/deny.toml b/deny.toml
@@ -17,8 +17,6 @@ allow = [
 ]
 
 exceptions = [
-    # Explicitly allows MPL-2 being pulled in through reqwest's rustls dependency chain (which uses webpki)
-    { name = "webpki-roots", allow = ["MPL-2.0"], version = "*" },
     { name = "unicode-ident", version = "1.0.2", allow = ["MIT", "Apache-2.0", "Unicode-DFS-2016"] },
 ]
 
@@ -62,6 +60,8 @@ allow-wildcard-paths = true
 skip = [
     # some libraries are using an older version of base64
     { name = "base64", version = "=0.21" },
+    # aws-smithy-runtime uses multiple versions of half
+    { name = "half", version = "=1.8" },
     # the aws rust sdk is using an older version of http
     { name = "http", version = "=0.2" },
     { name = "http-body", version = "=0.4" },

diff --git a/tuftool/Cargo.toml b/tuftool/Cargo.toml
@@ -26,7 +26,7 @@ log = "0.4"
 maplit = "1"
 olpc-cjson = { version = "0.1", path = "../olpc-cjson" }
 rayon = "1"
-reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] }
+reqwest = { version = "0.11", default-features = false, features = ["rustls-tls-native-roots"] }
 ring = { version = "0.17", features = ["std"] }
 serde = "1"
 serde_json = "1"