Skip to content

Commit 85cc0e5

Browse files
committed
Tidies up cryptographic provider error messaging
1 parent 41624be commit 85cc0e5

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

runtime/swimos_remote/src/tls/errors.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ pub enum TlsError {
3232
/// Performing the TLS handshake failed.
3333
#[error("TLS handshake failed: {0}")]
3434
HandshakeFailed(std::io::Error),
35-
#[error("Invalid cryptographic provider configured: {0}")]
36-
InvalidCryptoProvider(String),
35+
/// User specified that a cryptographic provider had been installed but none was found.
36+
#[error("No default cryptographic provider has been installed")]
37+
NoCryptoProviderInstalled,
38+
/// User specified more than one cryptographic provider feature flag. Only one may be specified.
39+
#[error("Ambiguous cryptographic provider feature flags specified. Only \"ring_provider\" or \"aws_lc_rs_provider\" may be specified")]
40+
InvalidCryptoProvider,
3741
}

runtime/swimos_remote/src/tls/mod.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ impl CryptoProviderConfig {
3838
pub fn try_build(self) -> Result<Arc<CryptoProvider>, TlsError> {
3939
match self {
4040
CryptoProviderConfig::ProcessDefault => CryptoProvider::get_default()
41-
.ok_or_else(|| {
42-
TlsError::InvalidCryptoProvider(
43-
"No default cryptographic provider specified".to_string(),
44-
)
45-
})
41+
.ok_or(TlsError::NoCryptoProviderInstalled)
4642
.cloned(),
4743
CryptoProviderConfig::FromFeatureFlags => {
4844
#[cfg(all(feature = "ring_provider", not(feature = "aws_lc_rs_provider")))]
@@ -57,7 +53,7 @@ impl CryptoProviderConfig {
5753

5854
#[allow(unreachable_code)]
5955
{
60-
Err(TlsError::InvalidCryptoProvider("Ambiguous cryptographic provider feature flags specified. Only \"ring_provider\" or \"aws_lc_rs_provider\" may be specified".to_string()))
56+
Err(TlsError::InvalidCryptoProvider)
6157
}
6258
}
6359
CryptoProviderConfig::Provided(provider) => Ok(provider),

0 commit comments

Comments
 (0)