From 43367888d687c4d313280b3ee518799a66cb1849 Mon Sep 17 00:00:00 2001
From: Daniel McCarney <daniel@binaryparadox.net>
Date: Fri, 16 Jun 2023 10:08:18 -0400
Subject: [PATCH] tests: fixup merge errs.

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.
---
 tests/client_auth_revocation.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/client_auth_revocation.rs b/tests/client_auth_revocation.rs
index 34cd5c58..333797f6 100644
--- a/tests/client_auth_revocation.rs
+++ b/tests/client_auth_revocation.rs
@@ -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()];
@@ -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(),
     )
@@ -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()];
@@ -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(),
     )
@@ -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()];