Skip to content

Commit

Permalink
remove sodiumoxide resolver
Browse files Browse the repository at this point in the history
it has been marked deprecated since 0.9,
as the crate is no longer maintained.
  • Loading branch information
mcginty committed Feb 19, 2025
1 parent 9eb74df commit 5649325
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 342 deletions.
6 changes: 1 addition & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ default-resolver-crypto = [
nightly = ["blake2/simd_opt", "subtle/nightly"]
ring-resolver = ["ring", "std"]
ring-accelerated = ["ring-resolver", "default-resolver", "std"]
libsodium-resolver = ["sodiumoxide", "byteorder", "std"]
libsodium-accelerated = ["libsodium-resolver", "default-resolver", "std"]
vector-tests = []
hfs = []
risky-raw-split = []
Expand Down Expand Up @@ -95,8 +93,6 @@ pqcrypto-traits = { version = "0.3", optional = true }

# ring crypto provider
ring = { version = "0.17", optional = true }
# libsodium crypto provider
sodiumoxide = { version = "0.2", optional = true, default-features = false }
byteorder = { version = "1.4", optional = true, default-features = false }

[dev-dependencies]
Expand All @@ -114,7 +110,7 @@ rand = "0.8"
rustc_version = "0.4"

[package.metadata.docs.rs]
features = ["ring-resolver", "libsodium-resolver"]
features = ["ring-resolver"]
all-features = false
no-default-features = false

Expand Down
2 changes: 0 additions & 2 deletions ci-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@ cargo test $TARGET --no-default-features --features "default-resolver use-curve2
cargo test $TARGET --no-default-features --features "default-resolver use-curve25519 use-sha2 use-chacha20poly1305"
cargo test $TARGET --features "ring-resolver $COMMON_FEATURES"
cargo test $TARGET --features "ring-accelerated $COMMON_FEATURES"
cargo test $TARGET --features "libsodium-resolver $COMMON_FEATURES"
cargo test $TARGET --features "libsodium-accelerated $COMMON_FEATURES"
18 changes: 2 additions & 16 deletions src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,7 @@ impl Debug for Builder<'_> {

impl<'builder> Builder<'builder> {
/// Create a Builder with the default crypto resolver.
#[cfg(all(
feature = "default-resolver",
not(any(feature = "ring-accelerated", feature = "libsodium-accelerated"))
))]
#[cfg(all(feature = "default-resolver", not(feature = "ring-accelerated")))]
#[must_use]
pub fn new(params: NoiseParams) -> Self {
use crate::resolvers::DefaultResolver;
Expand All @@ -87,7 +84,7 @@ impl<'builder> Builder<'builder> {
}

/// Create a Builder with the ring resolver and default resolver as a fallback.
#[cfg(all(not(feature = "libsodium-accelerated"), feature = "ring-accelerated"))]
#[cfg(feature = "ring-accelerated")]
pub fn new(params: NoiseParams) -> Self {
use crate::resolvers::{DefaultResolver, FallbackResolver, RingResolver};

Expand All @@ -97,17 +94,6 @@ impl<'builder> Builder<'builder> {
)
}

/// Create a Builder with the ring resolver and default resolver as a fallback.
#[cfg(all(not(feature = "ring-accelerated"), feature = "libsodium-accelerated"))]
pub fn new(params: NoiseParams) -> Self {
use crate::resolvers::{DefaultResolver, FallbackResolver, SodiumResolver};

Self::with_resolver(
params,
Box::new(FallbackResolver::new(Box::new(SodiumResolver), Box::new(DefaultResolver))),
)
}

/// Create a Builder with a custom crypto resolver.
#[must_use]
pub fn with_resolver(params: NoiseParams, resolver: BoxedCryptoResolver) -> Self {
Expand Down
312 changes: 0 additions & 312 deletions src/resolvers/libsodium.rs

This file was deleted.

Loading

0 comments on commit 5649325

Please sign in to comment.