chore(crypto): Remove OpenSSL-specific variants from public error types

internal/crypto/src/cose/certificate_trust_policy.rs

@@ -124,7 +124,7 @@ impl CertificateTrustPolicy {
         }
 
         Err(CertificateTrustError::InternalError(
-            "no implementation for certificate evaluation available",
+            "no implementation for certificate evaluation available".to_string(),
         ))
     }
 
@@ -344,18 +344,9 @@ pub enum CertificateTrustError {
     #[error("the certificate contains an invalid extended key usage (EKU) value")]
     InvalidEku,
 
-    /// An error was reported by the OpenSSL native code.
-    ///
-    /// NOTE: We do not directly capture the OpenSSL error itself because it
-    /// lacks an Eq implementation. Instead we capture the error description.
-    #[cfg(feature = "openssl")]
-    #[error("an error was reported by OpenSSL native code: {0}")]
-    OpenSslError(String),
-
-    /// The OpenSSL native code mutex could not be acquired.
-    #[cfg(feature = "openssl")]
-    #[error(transparent)]
-    OpenSslMutexUnavailable(#[from] crate::openssl::OpenSslMutexUnavailable),
+    /// An error was reported by the underlying cryptography implementation.
+    #[error("an error was reported by the cryptography library: {0}")]
+    CryptoLibraryError(String),
 
     /// The certificate (or certificate chain) that was presented is invalid.
     #[error("the certificate or certificate chain is invalid")]
@@ -364,13 +355,20 @@ pub enum CertificateTrustError {
     /// An unexpected internal error occured while requesting the time stamp
     /// response.
     #[error("internal error ({0})")]
-    InternalError(&'static str),
+    InternalError(String),
 }
 
 #[cfg(feature = "openssl")]
 impl From<openssl::error::ErrorStack> for CertificateTrustError {
     fn from(err: openssl::error::ErrorStack) -> Self {
-        Self::OpenSslError(err.to_string())
+        Self::CryptoLibraryError(err.to_string())
+    }
+}
+
+#[cfg(feature = "openssl")]
+impl From<crate::openssl::OpenSslMutexUnavailable> for CertificateTrustError {
+    fn from(err: crate::openssl::OpenSslMutexUnavailable) -> Self {
+        Self::InternalError(err.to_string())
     }
 }
 

internal/crypto/src/openssl/signers/ecdsa_signer.rs

@@ -124,10 +124,7 @@ impl RawSigner for EcdsaSigner {
 
         self.cert_chain
             .iter()
-            .map(|cert| {
-                cert.to_der()
-                    .map_err(|e| RawSignerError::OpenSslError(e.to_string()))
-            })
+            .map(|cert| cert.to_der().map_err(|e| e.into()))
             .collect()
     }
 }

internal/crypto/src/openssl/signers/ed25519_signer.rs

@@ -89,10 +89,7 @@ impl RawSigner for Ed25519Signer {
 
         self.cert_chain
             .iter()
-            .map(|cert| {
-                cert.to_der()
-                    .map_err(|e| RawSignerError::OpenSslError(e.to_string()))
-            })
+            .map(|cert| cert.to_der().map_err(|e| e.into()))
             .collect()
     }
 }

internal/crypto/src/openssl/signers/rsa_signer.rs

@@ -162,10 +162,7 @@ impl RawSigner for RsaSigner {
 
         self.cert_chain
             .iter()
-            .map(|cert| {
-                cert.to_der()
-                    .map_err(|e| RawSignerError::OpenSslError(e.to_string()))
-            })
+            .map(|cert| cert.to_der().map_err(|e| e.into()))
             .collect()
     }
 

internal/crypto/src/raw_signature/signer.rs

@@ -105,18 +105,9 @@ pub enum RawSignerError {
     #[error("I/O error ({0})")]
     IoError(String),
 
-    /// An error was reported by the OpenSSL native code.
-    ///
-    /// NOTE: We do not directly capture the OpenSSL error itself because it
-    /// lacks an `Eq` implementation. Instead we capture the error description.
-    #[cfg(feature = "openssl")]
-    #[error("an error was reported by OpenSSL native code: {0}")]
-    OpenSslError(String),
-
-    /// The OpenSSL native code mutex could not be acquired.
-    #[cfg(feature = "openssl")]
-    #[error(transparent)]
-    OpenSslMutexUnavailable(#[from] crate::openssl::OpenSslMutexUnavailable),
+    /// An error was reported by the underlying cryptography implementation.
+    #[error("an error was reported by the cryptography library: {0}")]
+    CryptoLibraryError(String),
 
     /// An unexpected internal error occured while requesting the time stamp
     /// response.
@@ -133,7 +124,14 @@ impl From<std::io::Error> for RawSignerError {
 #[cfg(feature = "openssl")]
 impl From<openssl::error::ErrorStack> for RawSignerError {
     fn from(err: openssl::error::ErrorStack) -> Self {
-        Self::OpenSslError(err.to_string())
+        Self::CryptoLibraryError(err.to_string())
+    }
+}
+
+#[cfg(feature = "openssl")]
+impl From<crate::openssl::OpenSslMutexUnavailable> for RawSignerError {
+    fn from(err: crate::openssl::OpenSslMutexUnavailable) -> Self {
+        Self::InternalError(err.to_string())
     }
 }
 

internal/crypto/src/raw_signature/validator.rs

@@ -154,18 +154,9 @@ pub enum RawSignatureValidationError {
     #[error("the signature does not match the provided data or public key")]
     SignatureMismatch,
 
-    /// An error was reported by the OpenSSL native code.
-    ///
-    /// NOTE: We do not directly capture the OpenSSL error itself because it
-    /// lacks an Eq implementation. Instead we capture the error description.
-    #[cfg(feature = "openssl")]
-    #[error("an error was reported by OpenSSL native code: {0}")]
-    OpenSslError(String),
-
-    /// The OpenSSL native code mutex could not be acquired.
-    #[cfg(feature = "openssl")]
-    #[error(transparent)]
-    OpenSslMutexUnavailable(#[from] crate::openssl::OpenSslMutexUnavailable),
+    /// An error was reported by the underlying cryptography implementation.
+    #[error("an error was reported by the cryptography library: {0}")]
+    CryptoLibraryError(String),
 
     /// An invalid public key was provided.
     #[error("invalid public key")]
@@ -182,13 +173,20 @@ pub enum RawSignatureValidationError {
     /// An unexpected internal error occured while requesting the time stamp
     /// response.
     #[error("internal error ({0})")]
-    InternalError(&'static str),
+    InternalError(String),
 }
 
 #[cfg(feature = "openssl")]
 impl From<openssl::error::ErrorStack> for RawSignatureValidationError {
     fn from(err: openssl::error::ErrorStack) -> Self {
-        Self::OpenSslError(err.to_string())
+        Self::CryptoLibraryError(err.to_string())
+    }
+}
+
+#[cfg(feature = "openssl")]
+impl From<crate::openssl::OpenSslMutexUnavailable> for RawSignatureValidationError {
+    fn from(err: crate::openssl::OpenSslMutexUnavailable) -> Self {
+        Self::InternalError(err.to_string())
     }
 }