Skip to content

Commit 3d66798

Browse files
committed
Removes duplicate crypto provider config
1 parent 93d6b94 commit 3d66798

File tree

1 file changed

+2
-36
lines changed
  • server/swimos_server_app/src/server/builder

1 file changed

+2
-36
lines changed

server/swimos_server_app/src/server/builder/mod.rs

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ use swimos_api::{
3131
use swimos_remote::dns::Resolver;
3232
use swimos_remote::plain::TokioPlainTextNetworking;
3333
use swimos_remote::tls::{
34-
ClientConfig, RustlsClientNetworking, RustlsNetworking, RustlsServerNetworking, TlsConfig,
34+
ClientConfig, CryptoProviderConfig, RustlsClientNetworking, RustlsNetworking,
35+
RustlsServerNetworking, TlsConfig,
3536
};
3637
use swimos_remote::ExternalConnections;
3738
use swimos_utilities::routing::RoutePattern;
@@ -50,41 +51,6 @@ use super::{
5051
BoxServer,
5152
};
5253

53-
#[derive(Default)]
54-
enum CryptoProviderConfig {
55-
ProcessDefault,
56-
#[default]
57-
FromFeatureFlags,
58-
Provided(Arc<CryptoProvider>),
59-
}
60-
61-
impl CryptoProviderConfig {
62-
fn build(self) -> Arc<CryptoProvider> {
63-
match self {
64-
CryptoProviderConfig::ProcessDefault => CryptoProvider::get_default()
65-
.expect("No default cryptographic provider specified")
66-
.clone(),
67-
CryptoProviderConfig::FromFeatureFlags => {
68-
#[cfg(all(feature = "ring_provider", not(feature = "aws_lc_rs_provider")))]
69-
{
70-
return Arc::new(rustls::crypto::ring::default_provider());
71-
}
72-
73-
#[cfg(all(feature = "aws_lc_rs_provider", not(feature = "ring_provider")))]
74-
{
75-
return Arc::new(rustls::crypto::aws_lc_rs::default_provider());
76-
}
77-
78-
#[allow(unreachable_code)]
79-
{
80-
panic!("Ambiguous cryptographic provider feature flags specified. Only \"ring_provider\" or \"aws_lc_rs_provider\" may be specified")
81-
}
82-
}
83-
CryptoProviderConfig::Provided(provider) => provider,
84-
}
85-
}
86-
}
87-
8854
/// Builder for a swimos server that will listen on a socket and run a suite of agents.
8955
pub struct ServerBuilder {
9056
bind_to: SocketAddr,

0 commit comments

Comments
 (0)