Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace native-tls with rust-tls

Browse Source
This commit is contained in:
Caelan Sayler
2024-11-15 14:34:35 +00:00
committed by Caelan
parent 96105b57c4
commit 1bdb671f33
5 changed files with 91 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib-rust/Cargo.toml
View File

@@ -43,7 +43,6 @@ regex.workspace = true
normpath.workspace = true
bitflags.workspace = true
rand.workspace = true
native-tls.workspace = true
sha1.workspace = true
sha2.workspace = true

7
src/lib-rust/src/download.rs
View File

@@ -48,9 +48,10 @@ pub fn download_url_as_string(url: &str) -> Result<String, Error> {
}
fn get_download_agent() -> Result<ureq::Agent, Error> {
let tls_builder = native_tls::TlsConnector::builder();
let tls_connector = tls_builder.build()?;
Ok(ureq::AgentBuilder::new().tls_connector(tls_connector.into()).build())
// let tls_builder = native_tls::TlsConnector::builder();
// let tls_connector = tls_builder.build()?;
// Ok(ureq::AgentBuilder::new().tls_connector(tls_connector.into()).build())
Ok(ureq::AgentBuilder::new().build())
}
#[test]

8
src/lib-rust/src/lib.rs
View File

@@ -115,8 +115,6 @@ pub enum NetworkError
{
#[error("Http error: {0}")]
Http(#[from] ureq::Error),
#[error("Tls error: {0}")]
Tls(#[from] native_tls::Error),
#[error("Url error: {0}")]
Url(#[from] url::ParseError),
}
@@ -159,10 +157,4 @@ impl From<ureq::Error> for Error {
fn from(err: ureq::Error) -> Self {
Error::Network(Box::new(NetworkError::Http(err)))
}
}
impl From<native_tls::Error> for Error {
fn from(err: native_tls::Error) -> Self {
Error::Network(Box::new(NetworkError::Tls(err)))
}
}