Skip to content

Commit

Permalink
Revert "Revert "cargo: trust-dns-resolver -> hickory-resolver""
Browse files Browse the repository at this point in the history
This reverts commit 8b5f72d
  • Loading branch information
phip1611 committed May 1, 2024
1 parent edaa20f commit b851624
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 68 deletions.
113 changes: 52 additions & 61 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,8 @@ bin = ["dep:clap", "dep:crossterm"]
[dependencies]
# +++ LIBRARY +++

# DNS over systems default DNS resolver.
# We stay on 0.23 of this no longer maintained project, as the successor doesn't
# build on Windows easily due to transitive dependendies...
# See <https://github.com/phip1611/ttfb/actions/runs/8647837533/job/23710236429?pr=49>
trust-dns-resolver = { version = "~0.23.0", default-features = false, features = ["dns-over-rustls", "system-config"] }
# DNS over systems default DNS resolver
hickory-resolver = { version = "0.24.0", features = ["dns-over-rustls", "system-config"] }
# TLS handshake
rustls = { version = "0.23.0", default-features = false, features = [ "tls12", "logging", "ring"] }
# rustls-connector = { version = "0.21.0", features = [
Expand Down
2 changes: 1 addition & 1 deletion src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ SOFTWARE.
//! Module for [`TtfbError`].
use derive_more::Display;
use hickory_resolver::error::{ResolveError, ResolveErrorKind};
use rustls_connector::HandshakeError;
use std::error::Error;
use std::io;
use std::net::TcpStream;
use trust_dns_resolver::error::{ResolveError, ResolveErrorKind};

/// Errors during DNS resolving.
#[derive(Clone, Debug, Display)]
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ SOFTWARE.
pub use error::{InvalidUrlError, ResolveDnsError, TtfbError};
pub use outcome::{DurationPair, TtfbOutcome};

use hickory_resolver::Resolver as DnsResolver;
use rustls::client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier};
use rustls::pki_types::{CertificateDer, ServerName, UnixTime};
use rustls::{ClientConfig, DigitallySignedStruct, Error, SignatureScheme};
Expand All @@ -67,7 +68,6 @@ use std::str::FromStr;
use std::sync::Arc;
use std::thread;
use std::time::{Duration, Instant};
use trust_dns_resolver::Resolver as DnsResolver;
use url::Url;

mod error;
Expand Down

0 comments on commit b851624

Please sign in to comment.