Bump ureq release to use more recent rustls

Nitrokey · Aug 21, 2024 · a1f021d · a1f021d
1 parent a44281a
commit a1f021d
Show file tree

Hide file tree

Showing 4 changed files with 267 additions and 58 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pkcs11/Cargo.toml b/pkcs11/Cargo.toml
@@ -22,11 +22,9 @@ serde = { version = "1", features = ["derive"], default-features = false }
 serde_yaml = "0.9.22"
 serde_json = { default-features = false, version = "1.0.64" }
 lazy_static = "1.4.0"
-nethsm-sdk-rs = { version = "1" }
-rustls = { version = "0.21", features = [
-  "dangerous_configuration",
-], default-features = false }
-rustls-native-certs = "0.6"
+nethsm-sdk-rs = { version = "1.1" }
+rustls = { version = "0.23", default-features = false }
+rustls-native-certs = "0.7"
 base64ct = { version = "1.6", default-features = false }
 hex = "0.4"
 der = { version = "0.7", default-features = false }
@@ -39,5 +37,8 @@ rayon = "1.8.0"
 syslog = "6.1.0"
 thiserror = "1.0.63"
 
+# Needed to prevent breaking change with rustls updates
+ureq = { version = "2.10", default-features = false }
+
 [dev-dependencies]
 hex-literal = "0.4.1"
diff --git a/pkcs11/src/backend/mod.rs b/pkcs11/src/backend/mod.rs
@@ -61,6 +61,7 @@ impl<T> From<apis::Error<T>> for ApiError {
                 }),
             }),
             apis::Error::StringParse(e) => ApiError::StringParse(e),
+            apis::Error::Multipart { field: _, error } => ApiError::Io(error),
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,7 @@ impl<T> From<apis::Error<T>> for ApiError { @@
                     }),
                 }),
                 apis::Error::StringParse(e) => ApiError::StringParse(e),
+                apis::Error::Multipart { field: _, error } => ApiError::Io(error),
             }
         }
     }
@@ Expand Down @@