From 6ae98d513adda331f62ccf00583de576c56aa355 Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Mon, 1 Apr 2024 16:15:12 -0600
Subject: [PATCH] spki: fix `OidUnknown` reporting

As noted in RustCrypto/RSA#422, we're not returning the actual "unknown
OID" encountered in these cases, but the expected one, which makes it
hard to debug mismatches.
---
 spki/src/algorithm.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spki/src/algorithm.rs b/spki/src/algorithm.rs
index a49c21df0..baa89cc4f 100644
--- a/spki/src/algorithm.rs
+++ b/spki/src/algorithm.rs
@@ -106,7 +106,7 @@ impl<Params> AlgorithmIdentifier<Params> {
         if self.oid == expected_oid {
             Ok(expected_oid)
         } else {
-            Err(Error::OidUnknown { oid: expected_oid })
+            Err(Error::OidUnknown { oid: self.oid })
         }
     }
 }
@@ -122,7 +122,7 @@ impl<'a> AlgorithmIdentifierRef<'a> {
         if actual_oid == expected_oid {
             Ok(actual_oid)
         } else {
-            Err(Error::OidUnknown { oid: expected_oid })
+            Err(Error::OidUnknown { oid: actual_oid })
         }
     }