github/tlsn
1
1
Fork 0
mirror of https://github.com/tlsnotary/tlsn.git synced 2026-01-08 22:28:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(tls-core): remove deprecated webpki error variants (#992)

Browse Source 
* fix(tls-core): remove deprecated webpki error variants

* clippy
This commit is contained in:
sinu.eth
2025-09-10 15:24:07 -07:00
committed by GitHub
parent 2909d5ebaa
commit 7bcfc56bd8
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/tls/client/tests/api.rs
View File

@@ -886,6 +886,7 @@ async fn client_error_is_sticky() {
} }
#[tokio::test] #[tokio::test]
#[allow(clippy::no_effect)]
#[allow(clippy::unnecessary_operation)] #[allow(clippy::unnecessary_operation)]
async fn client_is_send() { async fn client_is_send() {
let (client, _) = make_pair(KeyType::Rsa).await; let (client, _) = make_pair(KeyType::Rsa).await;

12
crates/tls/core/src/verify.rs
View File

@@ -415,7 +415,8 @@ pub(crate) fn pki_error(error: webpki::Error) -> Error {
match error { match error {
BadDer | BadDerTime => Error::InvalidCertificateEncoding, BadDer | BadDerTime => Error::InvalidCertificateEncoding,
InvalidSignatureForPublicKey => Error::InvalidCertificateSignature, InvalidSignatureForPublicKey => Error::InvalidCertificateSignature,
UnsupportedSignatureAlgorithm | UnsupportedSignatureAlgorithmForPublicKey => { UnsupportedSignatureAlgorithmContext(_)
| UnsupportedSignatureAlgorithmForPublicKeyContext(_) => {
Error::InvalidCertificateSignatureType Error::InvalidCertificateSignatureType
} }
e => Error::InvalidCertificateData(format!("invalid peer certificate: {e}")), e => Error::InvalidCertificateData(format!("invalid peer certificate: {e}")),
@@ -475,12 +476,17 @@ fn verify_sig_using_any_alg(
// we try them all. // we try them all.
for alg in algs { for alg in algs {
match cert.verify_signature(*alg, message, sig) { match cert.verify_signature(*alg, message, sig) {
Err(webpki::Error::UnsupportedSignatureAlgorithmForPublicKey) => continue, Err(webpki::Error::UnsupportedSignatureAlgorithmForPublicKeyContext(_)) => continue,
res => return res, res => return res,
} }
} }
Err(webpki::Error::UnsupportedSignatureAlgorithmForPublicKey) Err(webpki::Error::UnsupportedSignatureAlgorithmContext(
webpki::UnsupportedSignatureAlgorithmContext {
signature_algorithm_id: vec![],
supported_algorithms: algs.iter().map(|alg| alg.signature_alg_id()).collect(),
},
))
} }
fn verify_signed_struct( fn verify_signed_struct(