Skip to content

Commit

Permalink
tests: fixup merge errs.
Browse files Browse the repository at this point in the history
We had a small merge snafu where the `try_from` trait was removed in one
branch, but another branch had landed first that added more tests using
it. This commit fixes those tests to use `from_der` instead of the
missing `try_from` fn.
  • Loading branch information
cpu committed Jun 16, 2023
1 parent 92c21cf commit 4336788
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions tests/client_auth_revocation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ fn ee_revoked_wrong_ku_ee_depth() {
let intermediates =
&[include_bytes!("client_auth_revocation/no_crl_ku_chain.int.ca.der").as_slice()];
let ca = include_bytes!("client_auth_revocation/no_crl_ku_chain.root.ca.der");
let crls = &[webpki::CertRevocationList::try_from(
let crls = &[webpki::CertRevocationList::from_der(
include_bytes!("client_auth_revocation/ee_revoked_wrong_ku_ee_depth.crl.der").as_slice(),
)
.unwrap()];
Expand All @@ -170,7 +170,7 @@ fn ee_not_revoked_wrong_ku_ee_depth() {
let intermediates =
&[include_bytes!("client_auth_revocation/no_crl_ku_chain.int.ca.der").as_slice()];
let ca = include_bytes!("client_auth_revocation/no_crl_ku_chain.root.ca.der");
let crls = &[webpki::CertRevocationList::try_from(
let crls = &[webpki::CertRevocationList::from_der(
include_bytes!("client_auth_revocation/ee_not_revoked_wrong_ku_ee_depth.crl.der")
.as_slice(),
)
Expand Down Expand Up @@ -204,7 +204,7 @@ fn ee_revoked_crl_ku_ee_depth() {
let ee = include_bytes!("client_auth_revocation/ku_chain.ee.der");
let intermediates = &[include_bytes!("client_auth_revocation/ku_chain.int.ca.der").as_slice()];
let ca = include_bytes!("client_auth_revocation/ku_chain.root.ca.der");
let crls = &[webpki::CertRevocationList::try_from(
let crls = &[webpki::CertRevocationList::from_der(
include_bytes!("client_auth_revocation/ee_revoked_crl_ku_ee_depth.crl.der").as_slice(),
)
.unwrap()];
Expand Down Expand Up @@ -286,7 +286,7 @@ fn int_revoked_wrong_ku_chain_depth() {
let intermediates =
&[include_bytes!("client_auth_revocation/no_crl_ku_chain.int.ca.der").as_slice()];
let ca = include_bytes!("client_auth_revocation/no_crl_ku_chain.root.ca.der");
let crls = &[webpki::CertRevocationList::try_from(
let crls = &[webpki::CertRevocationList::from_der(
include_bytes!("client_auth_revocation/int_revoked_wrong_ku_chain_depth.crl.der")
.as_slice(),
)
Expand Down Expand Up @@ -354,7 +354,7 @@ fn int_revoked_crl_ku_chain_depth() {
let ee = include_bytes!("client_auth_revocation/ku_chain.ee.der");
let intermediates = &[include_bytes!("client_auth_revocation/ku_chain.int.ca.der").as_slice()];
let ca = include_bytes!("client_auth_revocation/ku_chain.root.ca.der");
let crls = &[webpki::CertRevocationList::try_from(
let crls = &[webpki::CertRevocationList::from_der(
include_bytes!("client_auth_revocation/int_revoked_crl_ku_chain_depth.crl.der").as_slice(),
)
.unwrap()];
Expand Down

0 comments on commit 4336788

Please sign in to comment.